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

Timestamp:

Feb 12, 2011, 9:41:33 PM (14 years ago)

Author:

Andrew Bradford <bradfa@…>

Branches:

master

Children:

b128a0e

Parents:

1fd00ea

Message:

Created MIPS and ARM GCC-Static files & cleanup

x86 no longer is common with MIPS and ARM for GCC-Static, so it has
its own GCC-Static file. In the previous implementation, there
was a lot of duplication between the common and x86 GCC-Static files.
This removes the duplication by better referencing the common file
and also creates MIPS and ARM specific GCC-Static files.

In this way, everything that is common to all architectures goes into
the common file and each architecture's GCC-Static file is specific
to the architecture.

* PLEASE NOTE *: As of this commit, GCC-Final is BROKEN for x86!
It will be fixed shortly.
DO NOT MERGE THIS UNTIL GCC-FINAL IS FIXED FOR x86!

Location:

BOOK/cross-tools/common

Files:

• gcc-final.xml (modified) (2 diffs)
• gcc-static.xml (modified) (4 diffs)

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

@@ -71 +71 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
+    xpointer="xpointer(//*[@os='ah'])"/>
 
 <screen os="ah"><userinput>make</userinput></screen>
@@ -77 +77 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
+    xpointer="xpointer(//*[@os='aj'])"/>
 
 <screen os="aj"><userinput>make install</userinput></screen>

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

@@ -25 +25 @@
 
   <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
+    <title os="a">Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
 
@@ -36 +36 @@
     <para os="e">Prepare GCC for compilation:</para>
 
+<!-- This is the common configure line for GCC-Static. -->
+<!-- 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 \
@@ -43 +45 @@
   --with-mpc=${CLFS}/cross-tools --without-headers --with-newlib \
   --disable-decimal-float --disable-libgomp --disable-libmudflap \
-  --disable-libssp --disable-threads --enable-languages=c \
-  --with-abi=${CLFS_ABI}</userinput></screen>
+  --disable-libssp --disable-threads --enable-languages=c</userinput></screen>
 
     <variablelist os="af">
@@ -207 +208 @@
       </varlistentry>
 
-      <varlistentry os="af19">
-        <term><parameter>--with-abi=${CLFS_ABI}</parameter></term>
-        <listitem>
-          <para>This option sets the ABI selected earlier.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
-    <para os="ag">Continue with compiling the package:</para>
-
-<screen os="ah"><userinput>make all-gcc all-target-libgcc</userinput></screen>
-
-    <para os="ai">Install the package:</para>
-
-<screen os="aj"><userinput>make install-gcc install-target-libgcc</userinput></screen>
+    <para os="ah">Continue with compiling the package:</para>
+
+<screen os="ai"><userinput>make all-gcc all-target-libgcc</userinput></screen>
+
+    <para os="aj">Install the package:</para>
+
+<screen os="ak"><userinput>make install-gcc install-target-libgcc</userinput></screen>
 
   </sect2>