Changes in chapter05/gcc-pass1.xml [1835fca:e502de1]

File:

• chapter05/gcc-pass1.xml (modified) (5 diffs)

chapter05/gcc-pass1.xml

@@ -63 +63 @@
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para arch="default">On x86_64 hosts, set the default directory name for
+    <para>On x86_64 hosts, set 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/' \
@@ -73 +73 @@
 esac</userinput></screen>
 
-    <para arch="ml_32,ml_x32,ml_all">Change the default directory name for
-    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>The GCC documentation recommends building GCC
     in a dedicated build directory:</para>
@@ -89 +81 @@
     <para>Prepare GCC for compilation:</para>
 
-<screen arch="default"><userinput remap="configure">../configure                  \
+<screen><userinput remap="configure">../configure                  \
     --target=$LFS_TGT         \
     --prefix=$LFS/tools       \
@@ -110 +102 @@
     --disable-libstdcxx       \
     --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                  \
-    --target=$LFS_TGT                              \
-    --prefix=$LFS/tools                            \
-    --with-glibc-version=&glibc-version;                      \
-    --with-sysroot=$LFS                            \
-    --with-newlib                                  \
-    --without-headers                              \
-    --enable-default-pie                           \
-    --enable-default-ssp                           \
-    --enable-initfini-array                        \
-    --disable-nls                                  \
-    --disable-shared                               \
-    --enable-multilib --with-multilib-list=$mlist  \
-    --disable-decimal-float                        \
-    --disable-threads                              \
-    --disable-libatomic                            \
-    --disable-libgomp                              \
-    --disable-libquadmath                          \
-    --disable-libssp                               \
-    --disable-libvtv                               \
-    --disable-libstdcxx                            \
-    --enable-languages=c,c++</userinput></screen>
-
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -193 +158 @@
       </varlistentry>
 
-      <varlistentry arch="default">
+      <varlistentry>
         <term><parameter>--disable-multilib</parameter></term>
         <listitem>
           <para>On x86_64, LFS does not support a multilib configuration.
           This switch is harmless for x86.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry arch="ml_32,ml_x32,ml_all">
-        <term><parameter>--enable-multilib --with-multilib-list=...</parameter></term>
-        <listitem>
-          <para>LFS canbe used to support multilib. Which they are is
-          specified in the multilib list.</para>
         </listitem>
       </varlistentry>