From 687a1b19e88241fe56d4523ea4a038eddc9fe053 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 3 Jan 2024 13:42:34 +0800
Subject: [PATCH] mips64el: gcc: use lib instead of lib64

---
 chapter05/gcc-pass1.xml | 13 ++++---------
 chapter06/gcc-pass2.xml | 12 ++++--------
 chapter08/gcc.xml       | 12 ++++--------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 7f33e5215..c331e0a64 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -62,15 +62,11 @@ mv -v gmp-&gmp-version; gmp
 tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para>On x86_64 hosts, set the default directory name for
+    <para>On 64-bit MIPS hosts, set the default directory name for
     64-bit libraries to <quote>lib</quote>:</para>
 
-<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>
+<screen><userinput remap="pre">sed -e 's/lib64/lib/' \
+    -i.orig gcc/config/mips/{mips.h,t-linux64}</userinput></screen>
 
     <para>The GCC documentation recommends building GCC
     in a dedicated build directory:</para>
@@ -159,8 +155,7 @@ cd       build</userinput></screen>
       <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>
+          <para>On 64-bit MIPS, LFS does not support a multilib configuration.</para>
         </listitem>
       </varlistentry>
 
diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml
index 98b28150d..522fb03ab 100644
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@ -57,15 +57,11 @@ mv -v gmp-&gmp-version; gmp
 tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para>If building on x86_64, change the default directory name for 64-bit
-    libraries to <quote>lib</quote>:</para>
+    <para>For building on 64-bit MIPS, change the default directory name for
+    64-bit libraries to <quote>lib</quote>:</para>
 
-<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>
+<screen><userinput remap="pre">sed -e 's/lib64/lib/' \
+    -i.orig gcc/config/mips/{mips.h,t-linux64}</userinput></screen>
 
     <para>Override the building rule of libgcc and libstdc++ headers, to
     allow building these libraries with POSIX threads support:</para>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 66f803273..5ef8d0814 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -54,15 +54,11 @@
 
     <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>
+    <para>For building on 64-bit MIPS, change the default directory name for
+    64-bit libraries to <quote>lib</quote>:</para>
 
-<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>
+<screen><userinput remap="pre">sed -e 's/lib64/lib/' \
+    -i.orig gcc/config/mips/{mips.h,t-linux64}</userinput></screen>
 
     <para>The GCC documentation recommends building GCC in a dedicated build directory:</para>