[lfs] 01/01: Merge

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib
in repository lfs.

commit b5062b4439cc44ac6ae3b0f5f034021396a2c98e
Merge: 6158563df ac68bc91b
Author: Thomas Trepl <[email protected]>
AuthorDate: Mon Aug 11 06:18:06 2025 +0200

    Merge

 chapter01/changelog.xml |  2 +-
 chapter06/gcc-pass2.xml | 14 +++++++-------
 chapter08/tcl.xml       |  3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --cc chapter06/gcc-pass2.xml
index 0e4c5c20d,d02ff5457..36cf6cf63
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@@ -53,31 -53,17 +53,31 @@@ mv -v gmp-&gmp-version; gm
  tar -xf ../mpc-&mpc-version;.tar.gz
  mv -v mpc-&mpc-version; mpc</userinput></screen>
  
 -    <para>If you are building on x86_64, change the default directory name for
 +
-     <para arch="default">If building on x86_64, change the default directory name for 64-bit
-     libraries to <quote>lib</quote>:</para>
++    <para arch="default">If you are 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/' \
          -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 arch="ml_32,ml_all">Make <literal>-mstackrealign</literal> a default for 32bit
 +      objects:</para>
 +
 +<screen arch="ml_32,ml_all"><userinput remap="pre">sed '/STACK_REALIGN_DEFAULT/s/0/(!TARGET_64BIT \&amp;\&amp; TARGET_SSE)/' \
 +      -i gcc/config/i386/i386.h</userinput></screen>
 +
-     <para>Override the building rule of libgcc and libstdc++ headers, to
+     <para>Override the build rules of the libgcc and libstdc++ headers to
      allow building these libraries with POSIX threads support:</para>
  
  <screen><userinput remap="pre">sed '/thread_header =/s/@.*@/gthr-posix.h/' \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page