[lfs] 01/05: Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

This is a multi-part message in MIME format...

------------=_1785571435-1024790-7148
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

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

git pushed a commit to branch xry111/loongarch
in repository lfs.

commit 2c35ae3bb4e81fd288dd4a4e03d7e61ffc311f0a
Merge: 017db05e4 b28a98b4a
Author: Xi Ruoyao <[email protected]>
AuthorDate: Tue Jun 2 21:47:45 2026 +0800

    Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

 chapter01/changelog.xml | 32 ++++++++++++++++++++++++++++-
 chapter01/whatsnew.xml  |  8 ++++----
 chapter03/patches.xml   |  4 ++--
 chapter06/gcc-pass2.xml | 54 +++++++++++++++++++++++++++----------------------
 chapter08/gcc.xml       | 16 ++++++++-------
 chapter08/systemd.xml   |  4 ++--
 packages.ent            | 42 +++++++++++++++++++-------------------
 patches.ent             |  3 ++-
 8 files changed, 101 insertions(+), 62 deletions(-)

diff --cc chapter06/gcc-pass2.xml
index 329392681,98dd9c875..119e388d8
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@@ -60,18 -53,16 +60,12 @@@ 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
 +    <para>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/loongarch/{t-linux,linux.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
diff --cc patches.ent
index b6dcb0851,e27f486cf..6ba77f435
--- a/patches.ent
+++ b/patches.ent
@@@ -62,9 -62,4 +62,10 @@@
  <!ENTITY systemd-upstream-patch "systemd-&systemd-version;-buildfix-1.patch">
  <!ENTITY systemd-upstream-patch-md5 "f08b5f6d1337ac9b0ed06ff9fa4226af">
  <!ENTITY systemd-upstream-patch-size "4.2 KB">
+ -->
 +
 +<!-- Put LoongArch patches last to reduce the chance of a conflict during
 +     merge.  -->
 +<!ENTITY gcc-loongarch-fixes-patch "gcc-&gcc-version;-loongarch_fixes-1.patch">
 +<!ENTITY gcc-loongarch-fixes-patch-md5 "ed890265d7cd49d99af55748d915a577">
 +<!ENTITY gcc-loongarch-fixes-patch-size "15 KB">

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

------------=_1785571435-1024790-7148
Content-Type: text/plain; charset="UTF-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0

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

------------=_1785571435-1024790-7148--