Changeset 3b3960b in clfs-embedded for BOOK/cross-tools/arm

Timestamp:

Feb 21, 2011, 4:37:57 AM (14 years ago)

Author:

Andrew Bradford <bradfa@…>

Branches:

master

Children:

e1ec8ed

Parents:

8a7de9f

Message:

ARM uClibc uses sed to change from OABI to EABI

Rather than use uClibc configs-3.patch, we previously changed back to using
configs-2.patch. This has uClibc choose OABI versus EABI for ARM based
on a sed command.

File:

• BOOK/cross-tools/arm/uclibc.xml (modified) (1 diff)

BOOK/cross-tools/arm/uclibc.xml

@@ -40 +40 @@
    <para os="d">For the ARM architecture, there are two different configurations
    of uClibc that can be used: the EABI configuration and the OABI configuration.
-   We will copy the one that corresponds with the $CLFS_ABI choice made earlier
-   and use that as the base:</para>
+   We will first copy the OABI configuration and, if the EABI was selected, modify
+   it to use the EABI:</para>
 
-<screen os="e"><userinput>if [ "${CLFS_ABI}" == "aapcs" ] || [ "${CLFS_ABI}" == "aapcs-linux" ]; \
-then cp -v clfs/config.${CLFS_ARCH}.${CLFS_ENDIAN}.EABI .config; \
-else cp -v clfs/config.${CLFS_ARCH}.${CLFS_ENDIAN} .config; fi</userinput></screen>
+<screen os="e"><userinput>cp -v clfs/config.${CLFS_ARCH}.${CLFS_ENDIAN} .config
+if [ "${CLFS_ABI}" == "aapcs" ] || [ "${CLFS_ABI}" == "aapcs-linux" ]; \
+then sed -i s/CONFIG_ARM_OABI/CONFIG_ARM_EABI/g .config; fi</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"