[lfs] 01/02: Merge branch 'trunk' into multilib

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

git pushed a commit to branch multilib
in repository lfs.

commit 06c90006e45d59ac41492b97f42841c6634dd91e
Merge: 220e71629 c41dfeaed
Author: Zeckmathederg <[email protected]>
AuthorDate: Tue Jun 2 17:14:03 2026 -0600

    Merge branch 'trunk' into multilib

 chapter01/changelog.xml | 32 +++++++++++++++++++++++++++-
 chapter01/whatsnew.xml  |  8 +++----
 chapter03/patches.xml   |  4 ++--
 chapter06/bash.xml      |  3 ++-
 chapter06/gcc-pass2.xml | 56 +++++++++++++++++++++++++++----------------------
 chapter08/gcc.xml       | 16 +++++++-------
 chapter08/systemd.xml   |  4 ++--
 packages.ent            | 42 ++++++++++++++++++-------------------
 patches.ent             |  3 ++-
 9 files changed, 104 insertions(+), 64 deletions(-)

diff --cc chapter06/gcc-pass2.xml
index b74096698,98dd9c875..e3afc3960
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@@ -53,26 -53,16 +53,19 @@@ mv -v gmp-&gmp-version; gm
  tar -xf ../mpc-&mpc-version;.tar.xz
  mv -v mpc-&mpc-version; mpc</userinput></screen>
  
- 
 -    <para>If you are building on x86_64, change the default directory name for
 -    64-bit libraries to <quote>lib</quote>:</para>
 +    <para>Change the default directory name for the
 +    libraries:</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 '/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>Make <literal>-mstackrealign</literal> a default for 32-bit
 +      objects:</para>
 +
 +<screen><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 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/' \
-     -i libgcc/Makefile.in libstdc++-v3/include/Makefile.in</userinput></screen>
- 
      <para>Create a separate build directory again:</para>
  
  <screen><userinput remap="pre">mkdir -v build
@@@ -83,25 -73,25 +76,27 @@@ cd       build</userinput></screen
  
      <para>Now prepare GCC for compilation:</para>
  
 -<screen><userinput remap="configure">../configure                   \
 -    --build=$(../config.guess) \
 -    --host=$LFS_TGT            \
 -    --target=$LFS_TGT          \
 -    --prefix=/usr              \
 -    --with-build-sysroot=$LFS  \
 -    --enable-default-pie       \
 -    --enable-default-ssp       \
 -    --disable-nls              \
 -    --disable-multilib         \
 -    --disable-libatomic        \
 -    --disable-libgomp          \
 -    --disable-libquadmath      \
 -    --disable-libsanitizer     \
 -    --disable-libssp           \
 -    --disable-libvtv           \
 -    --enable-languages=c,c++   \
++<<<<<<< HEAD
 +<screen><userinput remap="configure">../configure                     \
 +    --build=$(../config.guess)   \
 +    --host=$LFS_TGT              \
 +    --target=$LFS_TGT            \
 +    --prefix=/usr                \
 +    --with-build-sysroot=$LFS    \
 +    --enable-default-pie         \
 +    --enable-default-ssp         \
 +    --disable-nls                \
 +    --enable-multilib            \
 +    --with-multilib-list=m64,m32 \
 +    --disable-libatomic          \
 +    --disable-libgomp            \
 +    --disable-libquadmath        \
 +    --disable-libsanitizer       \
 +    --disable-libssp             \
 +    --disable-libvtv             \
 +    --enable-languages=c,c++     \
-     LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc</userinput></screen>
+     LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc \
+     target_configargs=gcc_cv_target_thread_file=posix</userinput></screen>
  
      <variablelist>
        <title>The meaning of the new configure options:</title><!-- WIP -->
diff --cc packages.ent
index 7ee7ad7a1,d924e22dd..1cc986a74
--- a/packages.ent
+++ b/packages.ent
@@@ -782,14 -755,14 +782,14 @@@
  <!ENTITY udev-lfs-url     "&anduin-sources;/&udev-lfs-version;.tar.xz">
  <!ENTITY udev-lfs-md5     "acd4360d8a5c3ef320b9db88d275dae6">
  <!ENTITY udev-lfs-home    " ">
 -<!ENTITY udev-fin-du "162 MB">
 -<!ENTITY udev-fin-sbu "0.1 SBU">
 +<!ENTITY udev-fin-du      "162 MB">
 +<!ENTITY udev-fin-sbu     "0.1 SBU">
  
  <!ENTITY util-linux-minor "2.42">
- <!ENTITY util-linux-version "2.42"> <!-- 2.41.x -->
- <!ENTITY util-linux-size "10,360 KB">
+ <!ENTITY util-linux-version "2.42.1"> <!-- 2.41.x -->
+ <!ENTITY util-linux-size "10,391 KB">
  <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
- <!ENTITY util-linux-md5 "cfb34c0a81a9907f25130c2f731e7e0b">
+ <!ENTITY util-linux-md5 "575bf65577d9bd0e65aeb073e8f61343">
  <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
  <!ENTITY util-linux-tmp-du "192 MB">
  <!ENTITY util-linux-tmp-sbu "0.2 SBU">

-- 
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