Changeset bd0ad10 in clfs-embedded for BOOK/cross-tools/common

Timestamp:

Feb 12, 2011, 2:12:12 PM (14 years ago)

Author:

Andrew Bradford <bradfa@…>

Branches:

master

Children:

7afc252

Parents:

b128a0e

Message:

Created MIPS and ARM GCC-Final files & cleanup

x86 is no longer common with MIPS and ARM for GCC-Final so it got its own
GCC-Final file. In order to reduce duplication between x86 GCC-Final
and the common GCC-Final, now MIPS and ARM also have their own GCC-Final
files, too.

In this way, everything that's common to all architectures goes in the
common GCC-Final file and each arch can do their own thing.
This will become more important once we start building GCC for a specific
processor, the ARM and MIPS configure lines will diverge.

* PLEASE NOTE *: This commit un-breaks GCC-Final for x86.
Feel free to merge.

File:

• BOOK/cross-tools/common/gcc-final.xml (modified) (5 diffs)

BOOK/cross-tools/common/gcc-final.xml

@@ -5 +5 @@
   %general-entities;
 ]>
+
+<!-- Common GCC-Final -->
 
 <sect1 id="ch-cross-tools-gcc-final" role="wrap">
@@ -16 +18 @@
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include role="package" xmlns:xi="http://www.w3.org/2003/XInclude"
   href="gcc-static.xml"
   xpointer="xpointer(//*[@role='package'])"/>
@@ -23 +25 @@
     <title>Installation of GCC Cross Compiler</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include os="c" xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include os="d" xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include os="e" xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
+<!-- This is the common configure line for GCC-Final -->
+<!-- It's not actually used by any arch but is here for reference. -->
 <screen os="ae"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \
   ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
@@ -41 +45 @@
   --enable-languages=c --enable-c99 --enable-long-long \
   --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
-  --with-mpc=${CLFS}/cross-tools --with-abi=${CLFS_ABI}</userinput></screen>
+  --with-mpc=${CLFS}/cross-tools</userinput></screen>
 
     <variablelist os="af">
@@ -69 +73 @@
     </variablelist>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include os="ah" xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
 
-<screen os="ah"><userinput>make</userinput></screen>
+<screen os="ai"><userinput>make</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include os="aj" xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aj'])"/>
 
-<screen os="aj"><userinput>make install</userinput></screen>
+<screen os="ak"><userinput>make install</userinput></screen>
 
   </sect2>