Changes in chapter06/gcc-pass2.xml [1835fca:0611f706]

File:

• chapter06/gcc-pass2.xml (modified) (3 diffs)

chapter06/gcc-pass2.xml

@@ -59 +59 @@
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-
-    <para arch="default">If building on x86_64, change the default directory name for 64-bit
+    <para>If building on x86_64, change the default directory name for 64-bit
     libraries to <quote>lib</quote>:</para>
 
-<screen arch="default"><userinput remap="pre">case $(uname -m) in
+<screen><userinput remap="pre">case $(uname -m) in
   x86_64)
     sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64
   ;;
 esac</userinput></screen>
-
-    <para arch="ml_32,ml_x32,ml_all">Change the default directory name for the
-    libraries:</para>
-
-<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
-    -i.orig gcc/config/i386/t-linux64</userinput></screen>
 
     <para>Override the building rule of libgcc and libstdc++ headers, to
@@ -92 +84 @@
     <para>Now prepare GCC for compilation:</para>
 
-<screen arch="default"><userinput remap="configure">../configure                                       \
+<screen><userinput remap="configure">../configure                                       \
     --build=$(../config.guess)                     \
     --host=$LFS_TGT                                \
@@ -110 +102 @@
     --disable-libvtv                               \
     --enable-languages=c,c++</userinput></screen>
-<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure" 
-    arch="ml_32">mlist=m64,m32</userinput><userinput remap="configure"
-    arch="ml_x32">mlist=m64,mx32</userinput><userinput remap="configure"
-    arch="ml_all">mlist=m64,m32,mx32</userinput>
-<userinput remap="configure">../configure                                       \
-    --build=$(../config.guess)                     \
-    --host=$LFS_TGT                                \
-    --target=$LFS_TGT                              \
-    LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc      \
-    --prefix=/usr                                  \
-    --with-build-sysroot=$LFS                      \
-    --enable-default-pie                           \
-    --enable-default-ssp                           \
-    --enable-initfini-array                        \
-    --disable-nls                                  \
-    --enable-multilib --with-multilib-list=$mlist  \
-    --disable-decimal-float                        \
-    --disable-libatomic                            \
-    --disable-libgomp                              \
-    --disable-libquadmath                          \
-    --disable-libssp                               \
-    --disable-libvtv                               \
-    --enable-languages=c,c++</userinput></screen>
-<!--
-    LDFLAGS_FOR_TARGET="-L$PWD/$LFS_TGT/libgcc -L$PWD/$LFS_TGT/32/libgcc -L$PWD/$LFS_TGT/x32/libgcc" \
--->
+
     <variablelist>
       <title>The meaning of the new configure options:</title><!-- WIP -->