Changeset 6a043e2 for BOOK/cross-tools/common

Timestamp:

Aug 27, 2008, 4:51:20 AM (16 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

ddbac3c

Parents:

5df4d80

Message:

Upgrade to GCC 4.3.1.

Location:

BOOK/cross-tools/common

Files:

• gcc-final.xml (modified) (3 diffs)
• gcc-static.xml (modified) (4 diffs)
• glibc.xml (modified) (1 diff)

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

@@ -23 +23 @@
     <title>Installation of GCC Cross Compiler</title>
 
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
@@ -56 +38 @@
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -100 +74 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${CLFS_TARGET} --host=${CLFS_HOST} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
+<screen os="bf"><userinput>AR=ar ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
+    --disable-multilib --with-local-prefix=/tools --disable-nls \
+    --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
     --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
 

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

@@ -24 +24 @@
     and no Threads</title>
 
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
     <para os="aa">Make a couple of essential adjustments to the specs file
     to ensure GCC uses our build environment:</para>
@@ -43 +33 @@
 
 <screen os="ad"><userinput>patch -Np1 -i ../&gcc-posix-patch;</userinput></screen>
-
-    <para os="ae">The following patch ensures that <command>gcc</command> does not
-    search the <filename class="directory">/usr</filename> directory for
-    <filename class="libraryfile">libgcc_s.so</filename> when
-    cross-compiling:</para>
-
-<screen os="af"><userinput>patch -Np1 -i ../&gcc-cross_search-patch;</userinput></screen>
 
     <para os="ag">Change the StartFile Spec to point to the correct library
@@ -77 +60 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
+<screen os="al"><userinput>AR=ar ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+    --disable-multilib --with-local-prefix=/tools --disable-nls \
+    --without-headers --with-newlib --disable-decimal-float \
+    --disable-libgomp --disable-libmudflap --disable-libssp \
+    --disable-shared --disable-threads --enable-languages=c</userinput></screen>
 
     <variablelist os="am">
@@ -124 +109 @@
     <para os="an">Continue with compiling the package:</para>
 
-<screen os="ao"><userinput>make all-gcc</userinput></screen>
+<screen os="ao"><userinput>make</userinput></screen>
 
     <para os="ap">Install the package:</para>
 
-<screen os="aq"><userinput>make install-gcc</userinput></screen>
+<screen os="aq"><userinput>make install</userinput></screen>
 
   </sect2>

BOOK/cross-tools/common/glibc.xml

@@ -26 +26 @@
     the method suggested in this book puts the stability of the system at
     risk.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <para os="db">Disable linking to <filename>libgcc_eh</filename>:</para>