Upgrade to GCC-4.6.0. Fixes #2847.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9493 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 14 insertions, 22 deletions

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 9420e5df6..5d21228ef 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -56,6 +56,12 @@ mv -v gmp-&gmp-version; gmp
 tar -zxf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
+<para>Apply a patch that will allow the building of the libiberty and zlib
+target libraries to be disabled as these do not build correctly in a
+cross-compiled environment:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&gcc-crosscompile-patch;</userinput></screen>
+
     <para>The GCC documentation recommends building GCC outside of the
     source directory in a dedicated build directory:</para>
 
@@ -69,9 +75,9 @@ cd ../gcc-build</userinput></screen>
     --disable-nls --disable-shared --disable-multilib \
     --disable-decimal-float --disable-threads \
     --disable-libmudflap --disable-libssp \
-    --disable-libgomp --enable-languages=c \
-    --with-gmp-include=$(pwd)/gmp --with-gmp-lib=$(pwd)/gmp/.libs \
-    --without-ppl --without-cloog</userinput></screen>
+    --disable-libgomp --disable-libquadmath \
+    --disable-target-libiberty --disable-target-zlib \
+    --enable-languages=c --without-ppl --without-cloog</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -86,11 +92,12 @@ cd ../gcc-build</userinput></screen>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-decimal-float, --disable-threads, --disable-libmudflap, --disable-libssp, --disable-libgomp</parameter></term>
+        <term><parameter>--disable-decimal-float, --disable-threads, --disable-libmudflap, --disable-libssp, --disable-libgomp, --disable-libquadmath --disable-target-libiberty --disable-target-zlib</parameter></term>
         <listitem>
-          <para>These switches disable support for the decimal floating point extension,
-          threading, libmudflap, libssp and libgomp respectively. These features will fail
-          to compile when building a cross-compiler and are not necessary for the task of
+          <para>These switches disable support for the decimal floating point
+          extension, threading, libmudflap, libssp and libgomp, libquadmath,
+          libiberty and zlib respectively. These features will fail to compile
+          when building a cross-compiler and are not necessary for the task of
           cross-compiling the temporary libc.</para>
         </listitem>
       </varlistentry>
@@ -112,20 +119,6 @@ cd ../gcc-build</userinput></screen>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--with-gmp-include=...</parameter></term>
-        <listitem>
-          <para>This option tells GCC where the GMP headers are located.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-gmp-lib=...</parameter></term>
-        <listitem>
-          <para>This option tells GCC where the GMP library is located.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>--without-ppl, --without-cloog</parameter></term>
         <listitem>
           <para>These switches prevent GCC from building against the PPL and
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index e191e7b84..85c1a5763 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -157,7 +157,6 @@ cd ../gcc-build</userinput></screen>
     --enable-__cxa_atexit --enable-languages=c,c++ \
     --disable-libstdcxx-pch --disable-multilib \
     --disable-bootstrap --disable-libgomp \
-    --with-gmp-include=$(pwd)/gmp --with-gmp-lib=$(pwd)/gmp/.libs \
     --without-ppl --without-cloog</userinput></screen>
 
     <variablelist>