Changes in chapter08/gcc.xml [1b11115:3a72ffa]

File:

• chapter08/gcc.xml (modified) (4 diffs)

chapter08/gcc.xml

@@ -50 +50 @@
     -i libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp</userinput></screen>
 -->
-    <para>First fix a problem with the latest version of glibc:</para>
-
-    <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-fixes-patch;</userinput></screen>
-
     <para>If building on x86_64, change the default directory name for 64-bit
     libraries to <quote>lib</quote>:</para>
 
-<screen><userinput remap="pre">case $(uname -m) in
+<screen arch="default"><userinput remap="pre">case $(uname -m) in
   x86_64)
     sed -e '/m64=/s/lib64/lib/' \
@@ -64 +60 @@
 esac</userinput></screen>
 
+    <para arch="ml_32,ml_x32,ml_all">Change the default directory name for 64-bit
+    libraries to <quote>lib</quote>:</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>
 
@@ -71 +74 @@
     <para>Prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">../configure --prefix=/usr            \
+<screen arch="default"><userinput remap="configure">../configure --prefix=/usr            \
              LD=ld                    \
              --enable-languages=c,c++ \
              --disable-multilib       \
              --disable-bootstrap      \
+             --with-system-zlib</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 --prefix=/usr               \
+             LD=ld                       \
+             --enable-languages=c,c++    \
+             --enable-multilib           \
+             --with-multilib-list=$mlist \
+             --disable-bootstrap         \
              --with-system-zlib</userinput></screen>
 
@@ -247 +261 @@
 SEARCH_DIR("/usr/lib");</computeroutput></screen>
 
-   <para>A 32-bit system may see a few different directories. For example, here
+   <para arch="default">A 32-bit system may see a few different directories. For example, here
    is the output from an i686 machine:</para>
 
-<screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib32")
+<!-- not using entities here as the dir names has nothing to do with multilib -->
+<screen arch="default"><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib32")
 SEARCH_DIR("/usr/local/lib32")
 SEARCH_DIR("/lib32")