Changes in chapter06/gcc-pass2.xml [7481894:f652d5bb]

File:

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

chapter06/gcc-pass2.xml

@@ -58 +58 @@
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para>Update the auxilary scripts of GMP building system to allow
-    building it for LoongArch:</para>
+    <para>If building on x86_64, change the default directory name for 64-bit
+    libraries to <quote>lib</quote>:</para>
 
-<screen><userinput remap="pre">cp config.{guess,sub} gmp</userinput></screen>
-
-    <para>Set the default directory name for
-    64-bit libraries to <quote>lib</quote>:</para>
-
-<screen><userinput remap="pre">sed 's/lib64/lib/' -i.orig gcc/config/loongarch/{t-linux,linux.h}</userinput></screen>
+<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>Override the building rule of libgcc and libstdc++ headers, to
@@ -98 +97 @@
     --disable-libgomp                              \
     --disable-libquadmath                          \
+    --disable-libsanitizer                         \
     --disable-libssp                               \
     --disable-libvtv                               \
@@ -145 +145 @@
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--disable-libsanitizer</parameter></term>
+        <listitem>
+          <para>Disable GCC sanitizer runtime libraries.  They are not
+          needed for the temporary installation.  This switch is necessary
+          to build GCC without
+          <systemitem class='library'>libcrypt</systemitem> installed for
+          the target.  In <xref linkend='ch-tools-gcc-pass1'/> it was
+          implied by <parameter>--disable-libstdcxx</parameter>, but now we
+          have to explicitly pass it.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>