9 changed files with 161 additions and 458 deletions
--- a/0020-more-fixes.patch
+++ b/0020-more-fixes.patch
@ -5,7 +5,7 @@ index b64e71dae22..5bf47b20820 100644
@@ -12,7 +12,6 @@
    jump threading opportunities.  Skip the later tests on aarch64.  */
 /* { dg-final { scan-tree-dump-not "Jumps threaded"  "dom3" { target { ! aarch64*-*-* } } } } */
- /* { dg-final { scan-tree-dump "Jumps threaded: 10"  "thread2" { target { ! aarch64*-*-* } } } } */
+ /* { dg-final { scan-tree-dump "Jumps threaded: 9"  "thread2" { target { ! aarch64*-*-* } } } } */
 -/* { dg-final { scan-tree-dump "Jumps threaded: 17"  "thread2" { target { aarch64*-*-* } } } } */
 
 enum STATE {
--- a/gating.yaml
+++ b/gating.yaml
@ -1,7 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-10
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
--- a/gcc-toolset-15-gcc.spec
+++ b/gcc-toolset-15-gcc.spec
@ -4,7 +4,6 @@
 %global have_scl_utils 0
 %endif
 %global gts_ver 15
-%global gts_next  %(v="%{gts_ver}"; echo $((++v)))
 %{?scl_package:%global scl gcc-toolset-%{gts_ver}}
 %global scl_prefix gcc-toolset-%{gts_ver}-
 %if %have_scl_utils
@ -16,13 +15,13 @@ BuildRequires: gcc-toolset-%{gts_ver}-devel
 %{?scl:%global __strip %%{_scl_root}/usr/bin/strip}
 %{?scl:%global __objdump %%{_scl_root}/usr/bin/objdump}
 %{?scl:%scl_package gcc}
-%global DATE 20260123
-%global gitrev 226e8310eed1ce10784f98f199e1aa4b12ca86b7
-%global gcc_version 15.2.1
+%global DATE 20250521
+%global gitrev b9def1721b12cae307c1a1ebc49030fce6531dfa
+%global gcc_version 15.1.1
 %global gcc_major 15
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %%{release}, append them after %%{gcc_release} on Release: line.
-%global gcc_release 7
+%global gcc_release 2
 %global nvptx_tools_gitrev 87ce9dc5999e5fca2e1d3478a30888d9864c9804
 %global newlib_cygwin_gitrev d35cc82b5ec15bb8a5fe0fe11e183d1887992e99
 %global isl_version 0.24
@ -165,14 +164,14 @@ BuildRequires: gcc-toolset-%{gts_ver}-devel
 %global multilib_32_arch i686
 %endif
 %if 0%{?fedora} >= 36 || 0%{?rhel} >= 8
-%global build_annobin_plugin 1
+%global build_annobin_plugin 0
 %else
 %global build_annobin_plugin 0
 %endif
 Summary: GCC version %{gcc_major}
 Name: %{?scl_prefix}gcc
 Version: %{gcc_version}
-Release: %{gcc_release}%{?dist}
+Release: %{gcc_release}.3%{?dist}
 # License notes for some of the less obvious ones:
 #   gcc/doc/cppinternals.texi: Linux-man-pages-copyleft-2-para
 #   isl: MIT, BSD-2-Clause
@ -252,10 +251,12 @@ BuildRequires: libzstd-devel
 BuildRequires: glibc >= 2.3.90-35
 %endif
 %ifarch %{multilib_64_archs}
-BuildRequires: (glibc32 or glibc-devel(%{__isa_name}-32))
+# Ensure glibc{,-devel} is installed for both multilib arches
+%if 0%{?rhel} < 10
+BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
+%else
+BuildRequires: /usr/lib/libc.so /usr/lib64/libc.so
 %endif
-%ifarch sparcv9 ppc
-BuildRequires: (glibc64 or glibc-devel(%{__isa_name}-64))
 %endif
 %ifarch ia64
 BuildRequires: libunwind >= 0.98
@ -299,7 +300,9 @@ Requires: libgcc >= 4.1.2-43
 Requires: libgomp >= 4.4.4-13
 # lto-wrapper invokes make
 Requires: make
-Requires: (%{?scl_prefix}runtime >= %{gts_ver} with %{?scl_prefix}runtime < %{gts_next})
+%if %have_scl_utils
+%{?scl:Requires:%scl_runtime}
+%endif
 AutoReq: true
 # Various libraries are imported.  #1859893 asks us to list them all.
 Provides: bundled(libiberty)
@ -357,9 +360,6 @@ Patch9: gcc15-Wno-format-security.patch
 Patch10: gcc15-rh1574936.patch
 Patch11: gcc15-d-shared-libphobos.patch
 Patch12: gcc15-pr119006.patch
-Patch13: gcc15-pr123273.patch
-Patch14: gcc15-pr123667.patch
-Patch15: gcc15-pr123737.patch

 Patch50: isl-rh2155127.patch

@ -605,11 +605,7 @@ which is used for -fsanitize=address instrumented programs.

 %package -n %{?scl_prefix}libasan-devel
 Summary: The Address Sanitizer static library
-%if 0%{?rhel} < 10
 Requires: libasan8%{_isa} >= 12.1.1
-%else
-Requires: libasan%{_isa} >= 14.2.1
-%endif
 Obsoletes: libasan5 <= 8.3.1

 %description -n %{?scl_prefix}libasan-devel
@ -624,7 +620,7 @@ which is used for -fsanitize=hwaddress instrumented programs.

 %package -n %{?scl_prefix}libhwasan-devel
 Summary: The Hardware-assisted Address Sanitizer static library
-Requires: libhwasan >= 14.2.1
+Requires: libhwasan >= 13.1.1

 %description -n %{?scl_prefix}libhwasan-devel
 This package contains Hardware-assisted Address Sanitizer static runtime
@ -639,11 +635,7 @@ which is used for -fsanitize=thread instrumented programs.

 %package -n %{?scl_prefix}libtsan-devel
 Summary: The Thread Sanitizer static library
-%if 0%{?rhel} < 10
 Requires: libtsan2%{_isa} >= 12.1.1
-%else
-Requires: libtsan%{_isa} >= 14.2.1
-%endif

 %description -n %{?scl_prefix}libtsan-devel
 This package contains Thread Sanitizer static runtime library.
@ -694,9 +686,6 @@ to NVidia PTX capable devices if available.
 %package -n %{?scl_prefix}gcc-plugin-annobin
 Summary: The annobin plugin for gcc, built by the installed version of gcc
 Requires: %{?scl_prefix}gcc = %{version}-%{release}
-%if 0%{?rhel} <= 8
-BuildRequires: %{?scl_prefix}annobin-plugin-gcc
-%endif
 BuildRequires: rpm-devel, binutils-devel, xz

 %description -n %{?scl_prefix}gcc-plugin-annobin
@ -723,9 +712,6 @@ so that there cannot be any synchronization problems.
 %patch -P10 -p0 -b .rh1574936~
 %patch -P11 -p0 -b .d-shared-libphobos~
 %patch -P12 -p0 -b .pr119006~
-%patch -P13 -p0 -b .pr123273~
-%patch -P14 -p0 -b .pr123667~
-%patch -P15 -p0 -b .pr123737~

 %patch -P100 -p1 -b .fortran-fdec-duplicates~

@ -829,6 +815,13 @@ sed -i '/^GENERATE_TREEVIEW/s/YES/NO/' libstdc++-v3/doc/doxygen/user.cfg.in
 # Undo the broken autoconf change in recent Fedora versions
 export CONFIG_SITE=NONE

+%if 0%{?rhel} == 10
+# Work around https://issues.redhat.com/browse/RHEL-49348
+%ifarch ppc64le
+export GLIBC_TUNABLES=glibc.cpu.hwcaps=-arch_3_1
+%endif
+%endif
+
 CC=gcc
 CXX=g++
 OPT_FLAGS="%{optflags}"
@ -985,11 +978,7 @@ CONFIGURE_OPTS="\
 	--with-long-double-128 \
 %endif
 %ifarch ppc64le
-%if 0%{?rhel} < 10
 	--with-long-double-format=ibm \
-%else
-	--with-long-double-format=ieee \
-%endif
 %endif
 %ifarch sparc
 	--disable-linux-futex \
@ -1086,9 +1075,6 @@ CONFIGURE_OPTS="\
 %ifnarch %{arm}
 	--with-build-config=bootstrap-lto --enable-link-serialization=1 \
 %endif
-%endif
-%if 0%{?rhel:1}
-	--enable-host-pie --enable-host-bind-now \
 %endif
 	"

@ -1184,11 +1170,7 @@ find rpm.doc -name \*ChangeLog\* | xargs bzip2 -9
 %if %{build_annobin_plugin}
 mkdir annobin-plugin
 cd annobin-plugin
-%if 0%{?rhel} <= 8
-tar xf %{_scl_root}/%{_usrsrc}/annobin/latest-annobin.tar.xz
-%else
 tar xf %{_usrsrc}/annobin/latest-annobin.tar.xz
-%endif
 cd annobin*
 touch aclocal.m4 configure Makefile.in */configure */config.h.in */Makefile.in
 ANNOBIN_FLAGS=../../obj-%{gcc_target_platform}/%{gcc_target_platform}/libstdc++-v3/scripts/testsuite_flags
@ -1487,15 +1469,6 @@ cp -a ../gcc/jit/libgccjit*.h $FULLPATH/include/
 /usr/bin/install -c -m 644 objlibgccjit/gcc/doc/libgccjit.info %{buildroot}/%{_infodir}/
 gzip -9 %{buildroot}/%{_infodir}/libgccjit.info

-rm -f $FULLEPATH/libgdiagnostics.so
-cp -a objlibgccjit/gcc/libgdiagnostics.so* %{buildroot}%{_prefix}/%{_lib}/
-cp -a ../gcc/libgdiagnostics*.h %{buildroot}%{_prefix}/include/
-cp -a objlibgccjit/gcc/sarif-replay %{buildroot}%{_prefix}/bin/
-
-sed -e 's,\.\./include/,../../../../include/,' \
-  %{buildroot}%{_prefix}/%{_lib}/libstdc++.modules.json \
-  > $FULLPATH/libstdc++.modules.json
-
 pushd $FULLPATH
 echo '/* GNU ld script */
 %{oformat}
@ -2524,13 +2497,11 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/gts-gcc-annobin.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/gts-gcc-annobin.so.0
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/gts-gcc-annobin.so.0.0.0
-%if 0%{?rhel} > 8
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/annobin.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/gcc-annobin.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/annobin.so.0.0.0
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/gcc-annobin.so.0.0.0
 %endif
-%endif

 %files c++
 %{_prefix}/bin/%{gcc_target_platform}-g++
@ -2582,7 +2553,6 @@ fi
 %dir %{_prefix}/lib/gcc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++.modules.json
 %ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libstdc++.a
@ -2908,50 +2878,15 @@ fi
 %endif

 %changelog
-* Mon Jan 26 2026 Siddhesh Poyarekar <siddhesh@redhat.com> 15.2.1-7
- update from releases/gcc-15 branch (RHEL-116507)
-  - PRs ada/68179, ada/123060, ada/123088, ada/123096, ada/123138, ada/123185,
-	ada/123289, ada/123302, ada/123306, ada/123371, ada/123589,
-	analyzer/122975, analyzer/123085, c/123156, c++/91388, c++/114764,
-	c++/116952, c++/120446, c++/121854, c++/121966, c++/122048,
-	c++/122070, c++/122550, c++/122668, c++/122752, c++/122772,
-	c++/122834, c++/122922, c++/123331, c++/123597, debug/121964,
-	diagnostics/120063, fortran/107406, libfortran/122936,
-	libstdc++/120446, libstdc++/122812, libstdc++/122907,
-	libstdc++/123147, middle-end/111817, middle-end/123107,
-	middle-end/123392, middle-end/123703, rtl-optimization/121773,
-	rtl-optimization/122215, rtl-optimization/123121,
-	rtl-optimization/123523, target/117575, target/119130,
-	target/120250, target/121192, target/121485, target/123022,
-	target/123092, target/123155, target/123217, target/123460,
-	target/123484, target/123489, target/123521, target/123607,
-	target/123742, testsuite/123353, tree-optimization/122793,
-	tree-optimization/122868, tree-optimization/123040,
-	tree-optimization/123300, tree-optimization/123351,
-	tree-optimization/123372, tree-optimization/123431,
-	tree-optimization/123513, tree-optimization/123602,
-	tree-optimization/123736, tree-optimization/123741
-
-* Tue Sep  9 2025 Siddhesh Poyarekar <siddhesh@redhat.com> 15.1.1-2.6
- Fix glibc32 build dependency (RHEL-113183)
-
-* Wed Jul 30 2025 Siddhesh Poyarekar <siddhesh@redhat.com> 15.1.1-2.5
- Drop the workaround for CVE-2025-5702 (RHEL-100161)
-
-* Fri Jun 20 2025 Siddhesh Poyarekar <siddhesh@redhat.com> 15.1.1-2.4
- Require gcc-toolset-N-runtime (RHEL-94672)
-
 * Mon Jun 16 2025 Marek Polacek <polacek@redhat.com> 15.1.1-2.3
- ship libstdc++.modules.json (RHEL-97043)
- configure with --with-long-double-format=ieee (RHEL-97055)
+- re-enable annobin-plugin and offload-nvptx

 * Thu Jun 12 2025 Siddhesh Poyarekar <siddhesh@redhat.com> 15.1.1-2.2
- Tune for z16 on s390x by default on RHEL10 and later (RHEL-94282)
 - Add AS_NEEDED libstdc++.so.6 when only needed through libstdc++_nonshared
-  (RHEL-84680)
+  (RHEL-94867)

-* Fri Jun  6 2025 Marek Polacek <polacek@redhat.com> 15.1.1-2.1
- configure with --enable-host-pie --enable-host-bind-now (RHEL-95595)
+* Thu May 29 2025 Marek Polacek <polacek@redhat.com> 15.1.1-2.1
+- adjust libstd++_nonshared.a symbols

 * Wed May 21 2025 Marek Polacek <polacek@redhat.com> 15.1.1-2
 - update from releases/gcc-15 branch
--- a/gcc15-libstdc++-compat.patch
+++ b/gcc15-libstdc++-compat.patch
@ -4198,7 +4198,7 @@
 +} // namespace
 --- libstdc++-v3/src/nonshared11/cxx11-ios_failure80.cc.jj	2025-05-06 15:48:48.589748944 +0200
 +++ libstdc++-v3/src/nonshared11/cxx11-ios_failure80.cc	2025-05-06 15:48:48.589748944 +0200
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,54 @@
 +// Copyright (C) 2012-2025 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@ -4249,6 +4249,10 @@
 +asm (".hidden _ZTSNSt8ios_base7failureB5cxx11E");
 +asm (".hidden _ZTINSt8ios_base7failureB5cxx11E");
 +asm (".hidden _ZSt19__throw_ios_failurePKc");
+#ifndef __powerpc64__
+asm (".hidden _ZNSt12system_errorC1ESt10error_codePKc");
+asm (".hidden _ZNSt12system_errorC2ESt10error_codePKc");
+#endif
 --- libstdc++-v3/src/nonshared11/shared_ptr80.cc.jj	2025-05-06 15:48:48.589748944 +0200
 +++ libstdc++-v3/src/nonshared11/shared_ptr80.cc	2025-05-06 15:48:48.589748944 +0200
@@ -0,0 +1,25 @@
@ -4568,7 +4572,7 @@
 +#endif
 --- libstdc++-v3/src/nonshared20/tzdb110.cc.jj	2025-05-06 15:48:48.608748687 +0200
 +++ libstdc++-v3/src/nonshared20/tzdb110.cc	2025-05-06 17:51:28.532972148 +0200
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,33 @@
 +// Copyright The GNU Toolchain Authors.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@ -4596,12 +4600,11 @@
 +asm (".hidden _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev");
 +asm (".hidden _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev");
 +asm (".hidden _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev");
-+#ifndef __powerpc64__
-+asm (".hidden _ZSt23__atomic_wait_address_vIiZNKSt13__atomic_baseIiE4waitEiSt12memory_orderEUlvE_EvPKT_S4_T0_");
+#ifndef __i386__
+//asm (".hidden _ZSt23__atomic_wait_address_vIiZNKSt13__atomic_baseIiE4waitEiSt12memory_orderEUlvE_EvPKT_S4_T0_");
 +#endif
 +#ifdef __i386__
-+//asm (".hidden _ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPNSt6chrono14time_zone_linkESt6vectorIS3_SaIS3_EEEENS0_5__ops14_Val_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessEMS3_KDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_EUlOSL_OSN_E_EEEvSL_SN_");
-+asm (".hidden _ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPNSt6chrono9time_zoneESt6vectorIS3_SaIS3_EEEENS0_5__ops14_Val_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessEMS3_KDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_EUlOSL_OSN_E_EEEvSL_SN_");
+asm (".hidden _ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPNSt6chrono14time_zone_linkESt6vectorIS3_SaIS3_EEEENS0_5__ops14_Val_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessEMS3_KDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_EUlOSL_OSN_E_EEEvSL_SN_");
 +#endif
 --- libstdc++-v3/src/nonshared20/sstream-inst80.cc.jj	2025-05-06 15:48:48.608748687 +0200
 +++ libstdc++-v3/src/nonshared20/sstream-inst80.cc	2025-05-06 15:48:48.608748687 +0200
@ -4840,9 +4843,6 @@
 +asm (".hidden _ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPNSt6chrono9time_zoneESt6vectorIS3_SaIS3_EEEENS0_5__ops15_Iter_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessESt8identityEEDaRT_RT0_EUlOSG_OSI_E_EEEvSG_SG_SI_");
 +asm (".hidden _ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPNSt6chrono14time_zone_linkESt6vectorIS3_SaIS3_EEEENS0_5__ops15_Iter_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessESt8identityEEDaRT_RT0_EUlOSG_OSI_E_EEEvSG_SG_SI_");
 +asm (".hidden _ZZNSt6ranges8__detail16__make_comp_projINS_4lessEMNSt6chrono9time_zoneEKDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_ENKUlOSB_OSD_E_clIRS4_SJ_EEbSF_SG_");
-+#ifndef __s390x__
-+//asm (".hidden _ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPNSt6chrono9time_zoneESt6vectorIS3_SaIS3_EEEENS0_5__ops14_Val_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessEMS3_KDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_EUlOSL_OSN_E_EEEvSL_SN_");
-+#endif
 +asm (".hidden _ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPNSt6chrono9time_zoneESt6vectorIS3_SaIS3_EEEENS0_5__ops15_Iter_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessEMS3_KDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_EUlOSL_OSN_E_EEEvSL_SL_SN_");
 +asm (".hidden _ZZNSt6ranges8__detail16__make_comp_projINS_4lessEMNSt6chrono14time_zone_linkEKDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_ENKUlOSB_OSD_E_clIRS4_SJ_EEbSF_SG_");
 +asm (".hidden _ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPNSt6chrono14time_zone_linkESt6vectorIS3_SaIS3_EEEENS0_5__ops15_Iter_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessEMS3_KDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_EUlOSL_OSN_E_EEEvSL_SL_SN_");
@ -4866,7 +4866,9 @@
 +asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EPKcjRKS3_");
 +asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7reserveEj");
 +asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_mutateEjjPKcj");
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEjjPKcj");
+#ifndef __i386__
+asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEjjPKcj");
+#endif
 +asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendEPKcj");
 +#else
 +asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC1EPKcmRKS3_");
@ -4877,6 +4879,7 @@
 +asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendEPKcm");
 +#endif
 +#ifdef __i386__
+asm (".hidden _ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPNSt6chrono9time_zoneESt6vectorIS3_SaIS3_EEEENS0_5__ops14_Val_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessEMS3_KDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_EUlOSL_OSN_E_EEEvSL_SN_");
 +asm (".hidden _ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPNSt6chrono14time_zone_linkESt6vectorIS3_SaIS3_EEEEiS3_NS0_5__ops15_Iter_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessEMS3_KDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_EUlOSL_OSN_E_EEEvSL_SN_SN_T1_T2_");
 +asm (".hidden _ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPNSt6chrono14time_zone_linkESt6vectorIS3_SaIS3_EEEEiS3_NS0_5__ops15_Iter_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessESt8identityEEDaRT_RT0_EUlOSG_OSI_E_EEEvSG_SI_SI_T1_T2_");
 +asm (".hidden _ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPNSt6chrono9time_zoneESt6vectorIS3_SaIS3_EEEEiS3_NS0_5__ops15_Iter_comp_iterIZNSt6ranges8__detail16__make_comp_projINSB_4lessEMS3_KDoFSt17basic_string_viewIcSt11char_traitsIcEEvEEEDaRT_RT0_EUlOSL_OSN_E_EEEvSL_SN_SN_T1_T2_");
@ -4899,8 +4902,8 @@
 +#ifndef __i386__
 +asm (".hidden _ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE24_M_release_last_use_coldEv");
 +#endif
-+#ifdef __i386__
-+//asm (".hidden _ZSt23__atomic_wait_address_vIiZNKSt13__atomic_baseIiE4waitEiSt12memory_orderEUlvE_EvPKT_S4_T0_");
+#ifndef __powerpc64__
+asm (".hidden _ZSt23__atomic_wait_address_vIiZNKSt13__atomic_baseIiE4waitEiSt12memory_orderEUlvE_EvPKT_S4_T0_");
 +#endif
 +asm (".hidden _ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv");
 +asm (".hidden _ZNSt10unique_ptrINSt10filesystem7__cxx114path5_List5_ImplENS3_13_Impl_deleterEED2Ev");
@ -5776,7 +5779,7 @@
 +asm (".hidden _ZNKSt6locale8encodingEv");
 +asm (".hidden _ZNSt13text_encoding11environmentEv");
 +asm (".hidden _ZNSt13text_encoding7_S_repsE");
-+#if defined(__s390x__)
+#ifdef __s390x__
 +asm (".hidden _ZNSt13text_encoding12_S_find_nameESt17basic_string_viewIcSt11char_traitsIcEE");
 +#endif
 --- libstdc++-v3/src/c++98/ios_failure.cc.jj	2025-04-17 12:55:03.460609249 +0200
@ -7782,7 +7785,7 @@
 } // namespace std
 --- libstdc++-v3/src/nonshared17/floating_from_chars.cc.jj	2025-05-06 15:48:48.684747659 +0200
 +++ libstdc++-v3/src/nonshared17/floating_from_chars.cc	2025-05-06 15:48:48.684747659 +0200
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,49 @@
 +// Copyright (C) 2019-2025 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@ -7825,15 +7828,13 @@
 +//asm (".hidden _ZSt10from_charsIiENSt9enable_ifIXsrSt5__or_IIS1_IISt7is_sameINSt9remove_cvIT_E4typeEaES2_IS6_sES2_IS6_iES2_IS6_lES2_IS6_xEEES1_IIS2_IS6_hES2_IS6_tES2_IS6_jES2_IS6_mES2_IS6_yEEES2_IcS6_EEE5valueESt17from_chars_resultE4typeEPKcSP_RS4_i");
 +//asm (".hidden _ZSt10from_charsIiENSt9enable_ifIXsrSt5__or_IJS1_IJSt7is_sameINSt9remove_cvIT_E4typeEaES2_IS6_sES2_IS6_iES2_IS6_lES2_IS6_xEEES1_IJS2_IS6_hES2_IS6_tES2_IS6_jES2_IS6_mES2_IS6_yEEES2_IcS6_EEE5valueESt17from_chars_resultE4typeEPKcSP_RS4_i");
 +#endif
-+#if defined(__i386__) || (defined(__powerpc__) && !defined(__powerpc64__))
+#if defined(__i386__)
 +asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcENSt3pmr21polymorphic_allocatorIcEEE15_M_replace_coldEPcjPKcjj");
-+#elif !defined(__s390x__) && !defined(__aarch64__)
+#else
 +asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcENSt3pmr21polymorphic_allocatorIcEEE15_M_replace_coldEPcmPKcmm");
 +#endif
 +asm (".hidden _ZNSt8__detail31__from_chars_alnum_to_val_tableILb0EE5valueE");
-+#if !defined(__s390x__)
 +asm (".hidden _ZSt10from_charsIiLi0EESt17from_chars_resultPKcS2_RT_i");
-+#endif
 --- libstdc++-v3/src/nonshared17/floating_from_chars110.cc.jj	2025-05-06 15:48:48.684747659 +0200
 +++ libstdc++-v3/src/nonshared17/floating_from_chars110.cc	2025-05-06 15:48:48.684747659 +0200
@@ -0,0 +1,45 @@
@ -7884,7 +7885,7 @@
 +#endif
 --- libstdc++-v3/src/nonshared17/cow-fs_ops.cc.jj	2025-05-06 15:48:48.685747645 +0200
 +++ libstdc++-v3/src/nonshared17/cow-fs_ops.cc	2025-05-07 08:24:39.541661744 +0200
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,91 @@
 +// Copyright (C) 2019-2025 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@ -7924,7 +7925,6 @@
 +//asm (".hidden _ZSt8_DestroyISt15_Deque_iteratorINSt10filesystem4pathERS2_PS2_EEvT_S6_");
 +asm (".hidden _ZNSsC1ISaIcEEEPKcRKS0_");
 +asm (".hidden _ZNSsC2ISaIcEEEPKcRKS0_");
-+//asm (".hidden _ZNSs4swapERSs");
 +#ifndef __i386__
 +//asm (".hidden _ZNSs9_M_mutateEmmm");
 +asm (".hidden _ZNSt11_Deque_baseINSt10filesystem4pathESaIS1_EE17_M_initialize_mapEm");
@ -7933,14 +7933,16 @@
 +asm (".hidden _ZNSt5dequeINSt10filesystem4pathESaIS1_EE23_M_new_elements_at_backEm");
 +asm (".hidden _ZNSt5dequeINSt10filesystem4pathESaIS1_EE24_M_new_elements_at_frontEm");
 +//asm (".hidden _ZNSs6resizeEmc");
-+//asm (".hidden _ZNSt10filesystem4pathD1Ev");
-+//asm (".hidden _ZNSt10filesystem4pathD2Ev");
 +asm (".hidden _ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE24_M_release_last_use_coldEv");
 +#endif
 +#if defined(__x86_64__)
 +//asm (".hidden _ZSt13move_backwardISt15_Deque_iteratorINSt10filesystem4pathERS2_PS2_ES5_ET0_T_S7_S6_");
 +//asm (".hidden _ZSt4moveISt15_Deque_iteratorINSt10filesystem4pathERS2_PS2_ES5_ET0_T_S7_S6_");
 +#endif
+#ifndef __powerpc64__
+asm (".hidden _ZNSt10filesystem4pathD1Ev");
+asm (".hidden _ZNSt10filesystem4pathD2Ev");
+#endif
 +#ifdef __i386__
 +asm (".hidden _ZNSt11_Deque_baseINSt10filesystem4pathESaIS1_EE17_M_initialize_mapEj");
 +asm (".hidden _ZNSt5dequeINSt10filesystem4pathESaIS1_EE13_M_insert_auxINS1_8iteratorEEEvSt15_Deque_iteratorIS1_RS1_PS1_ET_SA_j");
@ -7952,9 +7954,17 @@
 +//asm (".hidden _ZSt13move_backwardISt15_Deque_iteratorINSt10filesystem4pathERS2_PS2_ES5_ET0_T_S7_S6_");
 +//asm (".hidden _ZSt4moveISt15_Deque_iteratorINSt10filesystem4pathERS2_PS2_ES5_ET0_T_S7_S6_");
 +#endif
-+#if defined(__s390x__)
+#if !defined(__s390x__)
 +//asm (".hidden _ZSt16__do_uninit_copyINSt10filesystem4path8iteratorESt15_Deque_iteratorIS1_RS1_PS1_EET0_T_S8_S7_");
 +//asm (".hidden _ZSt4copyINSt10filesystem4path8iteratorESt15_Deque_iteratorIS1_RS1_PS1_EET0_T_S8_S7_");
+asm (".hidden _ZNSt5dequeINSt10filesystem4pathESaIS1_EE6insertINS1_8iteratorEvEESt15_Deque_iteratorIS1_RS1_PS1_ES6_IS1_RKS1_PSA_ET_SE_");
+#endif
+#if defined(__s390x__)
+asm (".hidden _ZNSt19_UninitDestroyGuardISt15_Deque_iteratorINSt10filesystem4pathERS2_PS2_EvED1Ev");
+asm (".hidden _ZNSt19_UninitDestroyGuardISt15_Deque_iteratorINSt10filesystem4pathERS2_PS2_EvED2Ev");
+asm (".hidden _ZNSt5dequeINSt10filesystem4pathESaIS1_EE15_M_range_appendINS1_8iteratorES5_EEvT_T0_m");
+asm (".hidden _ZNSt5dequeINSt10filesystem4pathESaIS1_EE16_M_range_prependINS1_8iteratorES5_EEvT_T0_m");
+asm (".hidden _ZSt25__uninitialized_copy_moveINSt10filesystem4path8iteratorESt15_Deque_iteratorIS1_RS1_PS1_ES6_SaIS1_EET1_T_S9_T0_SA_S8_RT2_");
 +#endif
 +#ifdef __aarch64__
 +//asm (".hidden _ZSt4copyINSt10filesystem4path8iteratorESt15_Deque_iteratorIS1_RS1_PS1_EET0_T_S8_S7_");
@ -7965,9 +7975,8 @@
 +#ifdef __powerpc64__
 +//asm (".hidden _ZSt16__do_uninit_copyINSt10filesystem4path8iteratorESt15_Deque_iteratorIS1_RS1_PS1_EET0_T_S8_S7_");
 +//asm (".hidden _ZSt4copyINSt10filesystem4path8iteratorESt15_Deque_iteratorIS1_RS1_PS1_EET0_T_S8_S7_");
-+//asm (".hidden _ZNSs4swapERSs");
 +#endif
-+asm (".hidden _ZNSt5dequeINSt10filesystem4pathESaIS1_EE6insertINS1_8iteratorEvEESt15_Deque_iteratorIS1_RS1_PS1_ES6_IS1_RKS1_PSA_ET_SE_");
+asm (".hidden _ZNSs4swapERSs");
 --- libstdc++-v3/src/nonshared17/eh_call.cc.jj	2025-05-06 15:48:48.685747645 +0200
 +++ libstdc++-v3/src/nonshared17/eh_call.cc	2025-05-06 15:48:48.685747645 +0200
@@ -0,0 +1,23 @@
@ -8040,7 +8049,7 @@
 +std::__shared_ptr<fs::recursive_directory_iterator::_Dir_stack>::operator bool () const noexcept;
 --- libstdc++-v3/src/nonshared17/cow-fs_path.cc.jj	2025-05-06 15:48:48.685747645 +0200
 +++ libstdc++-v3/src/nonshared17/cow-fs_path.cc	2025-05-07 08:25:37.285870805 +0200
-@@ -0,0 +1,134 @@
+@@ -0,0 +1,141 @@
 +// Copyright (C) 2019-2025 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@ -8107,8 +8116,6 @@
 +asm (".hidden _ZNSt10filesystem16filesystem_error5_Impl9make_whatESt17basic_string_viewIcSt11char_traitsIcEEPKNS_4pathES8_");
 +asm (".hidden _ZNSt10unique_ptrINSt10filesystem4path5_List5_ImplENS2_13_Impl_deleterEED1Ev");
 +asm (".hidden _ZNSt10unique_ptrINSt10filesystem4path5_List5_ImplENS2_13_Impl_deleterEED2Ev");
-+//asm (".hidden _ZNSt12system_errorC1ESt10error_codeRKSs");
-+//asm (".hidden _ZNSt12system_errorC2ESt10error_codeRKSs");
 +asm (".hidden _ZNSt15__allocated_ptrISaISt23_Sp_counted_ptr_inplaceINSt10filesystem16filesystem_error5_ImplESaIS3_ELN9__gnu_cxx12_Lock_policyE2EEEED1Ev");
 +asm (".hidden _ZNSt15__allocated_ptrISaISt23_Sp_counted_ptr_inplaceINSt10filesystem16filesystem_error5_ImplESaIS3_ELN9__gnu_cxx12_Lock_policyE2EEEED2Ev");
 +asm (".hidden _ZNSt23_Sp_counted_ptr_inplaceINSt10filesystem16filesystem_error5_ImplESaIS2_ELN9__gnu_cxx12_Lock_policyE2EED2Ev");
@ -8121,42 +8128,51 @@
 +//asm (".hidden _ZZNSt10filesystem4path10_S_convertIwEEDaPKT_S4_EN5_UCvtD1Ev");
 +//asm (".hidden _ZZNSt10filesystem4path10_S_convertIwEEDaPKT_S4_EN5_UCvtD2Ev");
 +//asm (".hidden _ZNKSt10filesystem4path5_List5_Impl4copyEv");
-+//asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE12_M_leak_hardEv");
-+//asm (".hidden _ZNSs12_M_leak_hardEv");
 +//asm (".hidden _ZNSs4swapERSs");
 +//asm (".hidden _ZNSs6appendERKSs");
-+//asm (".hidden _ZNSt10filesystem4path5_List5beginEv");
 +//asm (".hidden _ZNSt10filesystem4path7_Parser4nextEv");
 +#ifndef __i386__
 +asm (".hidden _ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE24_M_release_last_use_coldEv");
 +//asm (".hidden _ZSt16__do_str_codecvtISbIwSt11char_traitsIwESaIwEEcSt7codecvtIwc11__mbstate_tES5_MS6_KFNSt12codecvt_base6resultERS5_PKcSB_RSB_PwSD_RSD_EEbPKT0_SJ_RT_RKT1_RT2_RmT3_");
-+//asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE6resizeEmw");
-+//asm (".hidden _ZNSs7reserveEm");
-+//asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE7reserveEm");
 +//asm (".hidden _ZNSsC1ERKSsmm");
-+//asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE9_M_mutateEmmm");
-+//asm (".hidden _ZNSs6insertEmPKcm");
-+//asm (".hidden _ZNSs6resizeEmc");
-+//asm (".hidden _ZNSs9_M_mutateEmmm");
 +//asm (".hidden _ZNSsC2ERKSsmm");
-+//asm (".hidden _ZNSt10filesystem4pathD1Ev");
-+//asm (".hidden _ZSt16__do_str_codecvtISswSt7codecvtIwc11__mbstate_tES1_MS2_KFNSt12codecvt_base6resultERS1_PKwS7_RS7_PcS9_RS9_EEbPKT0_SF_RT_RKT1_RT2_RmT3_");
 +#endif
-+#if defined(__aarch64__) || defined(__x86_64__)
-+//asm (".hidden _ZNSt10filesystem4pathD2Ev");
+#if defined(__x86_64__) || defined(__aarch64__) || defined(__s390x__)
+asm (".hidden _ZNSs6insertEmPKcm");
+asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE12_M_leak_hardEv");
+asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE6resizeEmw");
+asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE7reserveEm");
+asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE9_M_mutateEmmm");
+asm (".hidden _ZNSs12_M_leak_hardEv");
+asm (".hidden _ZNSs6resizeEmc");
+asm (".hidden _ZNSs7reserveEm");
+asm (".hidden _ZNSs9_M_mutateEmmm");
+asm (".hidden _ZNSt10filesystem4path5_List5beginEv");
+asm (".hidden _ZNSt10filesystem4pathD1Ev");
+asm (".hidden _ZNSt10filesystem4pathD2Ev");
+asm (".hidden _ZNSt12system_errorC1ESt10error_codeRKSs");
+asm (".hidden _ZNSt12system_errorC2ESt10error_codeRKSs");
+asm (".hidden _ZSt16__do_str_codecvtISswSt7codecvtIwc11__mbstate_tES1_MS2_KFNSt12codecvt_base6resultERS1_PKwS7_RS7_PcS9_RS9_EEbPKT0_SF_RT_RKT1_RT2_RmT3_");
 +#endif
 +#ifdef __i386__
-+//asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE6resizeEjw");
-+//asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE7reserveEj");
-+//asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE9_M_mutateEjjj");
-+//asm (".hidden _ZNSs6insertEjPKcj");
-+//asm (".hidden _ZNSs6resizeEjc");
-+//asm (".hidden _ZNSs7reserveEj");
-+//asm (".hidden _ZNSs9_M_mutateEjjj");
+asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE12_M_leak_hardEv");
+asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE6resizeEjw");
+asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE7reserveEj");
+asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE9_M_mutateEjjj");
+asm (".hidden _ZNSs12_M_leak_hardEv");
+asm (".hidden _ZNSs6insertEjPKcj");
+asm (".hidden _ZNSs6resizeEjc");
+asm (".hidden _ZNSs7reserveEj");
+asm (".hidden _ZNSs9_M_mutateEjjj");
+asm (".hidden _ZNSt10filesystem4path5_List5beginEv");
+asm (".hidden _ZNSt10filesystem4pathD1Ev");
+asm (".hidden _ZNSt10filesystem4pathD2Ev");
+asm (".hidden _ZNSt12system_errorC1ESt10error_codeRKSs");
+asm (".hidden _ZNSt12system_errorC2ESt10error_codeRKSs");
 +//asm (".hidden _ZNSsC1ERKSsjj");
 +//asm (".hidden _ZNSsC2ERKSsjj");
 +//asm (".hidden _ZSt16__do_str_codecvtISbIwSt11char_traitsIwESaIwEEcSt7codecvtIwc11__mbstate_tES5_MS6_KFNSt12codecvt_base6resultERS5_PKcSB_RSB_PwSD_RSD_EEbPKT0_SJ_RT_RKT1_RT2_RjT3_");
-+//asm (".hidden _ZSt16__do_str_codecvtISswSt7codecvtIwc11__mbstate_tES1_MS2_KFNSt12codecvt_base6resultERS1_PKwS7_RS7_PcS9_RS9_EEbPKT0_SF_RT_RKT1_RT2_RjT3_");
+asm (".hidden _ZSt16__do_str_codecvtISswSt7codecvtIwc11__mbstate_tES1_MS2_KFNSt12codecvt_base6resultERS1_PKwS7_RS7_PcS9_RS9_EEbPKT0_SF_RT_RKT1_RT2_RjT3_");
 +#endif
 +asm (".hidden _ZNSt10filesystem4path8_CodecvtIwED0Ev");
 +asm (".hidden _ZNSt10filesystem4path8_CodecvtIwED1Ev");
@ -8242,12 +8258,12 @@
 +//asm (".hidden _ZNSt6vectorINSt3pmr15__pool_resource9_BigBlockENS0_21polymorphic_allocatorIS2_EEE17_M_realloc_insertIIRjS7_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S5_EEDpOT_");
 +//asm (".hidden _ZNSt6vectorINSt3pmr15__pool_resource9_BigBlockENS0_21polymorphic_allocatorIS2_EEE17_M_realloc_insertIJRjS7_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S5_EEDpOT_");
 +#endif
-+#ifdef __powerpc64__
+#ifndef __powerpc64__
 +//asm (".hidden _ZNSt3pmr15__pool_resource5_Pool10deallocateEPNS_15memory_resourceEPv");
+asm (".hidden _ZNSt22__shared_mutex_pthread6unlockEv");
 +#endif
-+//asm (".hidden _ZNSt22__shared_mutex_pthread6unlockEv");
-+#if defined(__i386__) || (defined(__powerpc__) && !defined(__powerpc64__))
-+asm (".hidden _ZNSt6vectorINSt3pmr15__pool_resource9_BigBlockENS0_21polymorphic_allocatorIS2_EEE17_M_realloc_appendIIRjS7_EEEvDpOT_");
+#if defined(__i386__)
+//asm (".hidden _ZNSt6vectorINSt3pmr15__pool_resource9_BigBlockENS0_21polymorphic_allocatorIS2_EEE17_M_realloc_appendIIRjS7_EEEvDpOT_");
 +asm (".hidden _ZNSt6vectorINSt3pmr15__pool_resource9_BigBlockENS0_21polymorphic_allocatorIS2_EEE17_M_realloc_appendIJRjS7_EEEvDpOT_");
 +#else
 +//asm (".hidden _ZNSt6vectorINSt3pmr15__pool_resource9_BigBlockENS0_21polymorphic_allocatorIS2_EEE17_M_realloc_appendIIRmS7_EEEvDpOT_");
@ -8255,7 +8271,7 @@
 +#endif
 --- libstdc++-v3/src/nonshared17/fs_dir.cc.jj	2025-05-06 15:48:48.686747631 +0200
 +++ libstdc++-v3/src/nonshared17/fs_dir.cc	2025-05-07 08:16:13.911587479 +0200
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,108 @@
 +// Copyright (C) 2019-2025 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@ -8292,6 +8308,10 @@
 +asm (".hidden _ZNSt10filesystem7__cxx114_Dir7advanceEbRSt10error_code");
 +asm (".hidden _ZNSt10filesystem7__cxx114_DirD1Ev");
 +asm (".hidden _ZNSt10filesystem7__cxx114_DirD2Ev");
+#ifndef __powerpc64__
+asm (".hidden _ZNSt10filesystem7__cxx114pathC1INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES1_EERKT_NS1_6formatE");
+asm (".hidden _ZNSt10filesystem7__cxx114pathC2INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES1_EERKT_NS1_6formatE");
+#endif
 +#ifdef __x86_64__
 +asm (".hidden _ZNSt10filesystem9_Dir_base7advanceEbRSt10error_code");
 +//asm (".hidden _ZNSt10filesystem9_Dir_baseC1EPKcbRSt10error_code");
@ -8351,17 +8371,20 @@
 +asm (".hidden _ZNSt10unique_ptrINSt10filesystem7__cxx114path5_List5_ImplENS3_13_Impl_deleterEED2Ev");
 +#ifdef __i386__
 +asm (".hidden _ZNSt10filesystem9_Dir_base7advanceEbRSt10error_code");
+asm (".hidden _ZNSt5dequeINSt10filesystem7__cxx114_DirESaIS2_EE17_M_reallocate_mapEjb");
 +#endif
 +asm (".hidden _ZNKSt10filesystem7__cxx114_Dir11open_subdirEbbRSt10error_code");
 +asm (".hidden _ZNKSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stack12current_pathEv");
 +asm (".hidden _ZNSt10filesystem7__cxx1128recursive_directory_iterator7__eraseEPSt10error_code");
 +//asm (".hidden _ZNKSt10filesystem7__cxx114_Dir16dir_and_pathnameEv");
-+//asm (".hidden _ZNKSt10filesystem7__cxx114_Dir7currentEv");
+#ifndef __powerpc64__
+asm (".hidden _ZNKSt10filesystem7__cxx114_Dir7currentEv");
+#endif
 +//asm (".hidden _ZNSt10filesystem7__cxx114_DirC1ERKNS0_4pathEbbbRSt10error_code");
 +//asm (".hidden _ZNSt10filesystem7__cxx114_DirC2ERKNS0_4pathEbbbRSt10error_code");
 --- libstdc++-v3/src/nonshared17/fs_ops80.cc.jj	2025-05-06 15:48:48.686747631 +0200
 +++ libstdc++-v3/src/nonshared17/fs_ops80.cc	2025-05-07 08:26:54.435814071 +0200
-@@ -0,0 +1,105 @@
+@@ -0,0 +1,109 @@
 +// Copyright (C) 2019-2025 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@ -8419,8 +8442,13 @@
 +//asm (".hidden _ZSt4moveISt15_Deque_iteratorINSt10filesystem7__cxx114pathERS3_PS3_ES6_ET0_T_S8_S7_");
 +#endif
 +#endif
-+#if defined(__s390x__) || defined(__powerpc64__)
+#if defined(__s390x__)
 +//asm (".hidden _ZSt13__copy_move_aILb0ENSt10filesystem7__cxx114path8iteratorESt15_Deque_iteratorIS2_RS2_PS2_EET1_T0_S9_S8_");
+asm (".hidden _ZNSt19_UninitDestroyGuardISt15_Deque_iteratorINSt10filesystem7__cxx114pathERS3_PS3_EvED1Ev");
+asm (".hidden _ZNSt19_UninitDestroyGuardISt15_Deque_iteratorINSt10filesystem7__cxx114pathERS3_PS3_EvED2Ev");
+asm (".hidden _ZNSt5dequeINSt10filesystem7__cxx114pathESaIS2_EE15_M_range_appendINS2_8iteratorES6_EEvT_T0_m");
+asm (".hidden _ZNSt5dequeINSt10filesystem7__cxx114pathESaIS2_EE16_M_range_prependINS2_8iteratorES6_EEvT_T0_m");
+asm (".hidden _ZSt25__uninitialized_copy_moveINSt10filesystem7__cxx114path8iteratorESt15_Deque_iteratorIS2_RS2_PS2_ES7_SaIS2_EET1_T_SA_T0_SB_S9_RT2_");
 +#endif
 +#ifdef __i386__
 +asm (".hidden _ZN9__gnu_cxx13stdio_filebufIcSt11char_traitsIcEEC1EiSt13_Ios_Openmodej");
@ -8434,13 +8462,11 @@
 +#endif
 +#ifdef __aarch64__
 +//asm (".hidden _ZSt4copyINSt10filesystem7__cxx114path8iteratorESt15_Deque_iteratorIS2_RS2_PS2_EET0_T_S9_S8_");
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4swapERS4_");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc");
 +#endif
 +//asm (".hidden _ZNSt5dequeINSt10filesystem7__cxx114pathESaIS2_EE12emplace_backIIS2_EEERS2_DpOT_");
 +//asm (".hidden _ZNSt5dequeINSt10filesystem7__cxx114pathESaIS2_EE12emplace_backIJS2_EEERS2_DpOT_");
 +#ifdef __powerpc64__
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4swapERS4_");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc");
 +#endif
 +#ifndef __i386__
@ -8450,12 +8476,10 @@
 +//asm (".hidden _ZSt16__do_uninit_copyINSt10filesystem7__cxx114path8iteratorESt15_Deque_iteratorIS2_RS2_PS2_EET0_T_S9_S8_");
 +//asm (".hidden _ZSt4copyINSt10filesystem7__cxx114path8iteratorESt15_Deque_iteratorIS2_RS2_PS2_EET0_T_S9_S8_");
 +#endif
-+#if defined(__x86_64__) || defined(__s390x__)
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4swapERS4_");
+#if defined(__x86_64__)
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc");
 +#endif
 +#ifdef __i386__
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4swapERS4_");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEjc");
 +//asm (".hidden _ZSt13move_backwardISt15_Deque_iteratorINSt10filesystem7__cxx114pathERS3_PS3_ES6_ET0_T_S8_S7_");
 +//asm (".hidden _ZSt4moveISt15_Deque_iteratorINSt10filesystem7__cxx114pathERS3_PS3_ES6_ET0_T_S8_S7_");
@ -8466,10 +8490,13 @@
 +asm (".hidden _ZNSt10filesystem18copy_file_sendfileEiim");
 +#endif
 +asm (".hidden _ZNSt10filesystem11equiv_filesEPKcRK4statS1_S4_RSt10error_code");
+#if !defined(__s390x__)
 +asm (".hidden _ZNSt5dequeINSt10filesystem7__cxx114pathESaIS2_EE6insertINS2_8iteratorEvEESt15_Deque_iteratorIS2_RS2_PS2_ES7_IS2_RKS2_PSB_ET_SF_");
+#endif
+asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4swapERS4_");
 --- libstdc++-v3/src/nonshared17/fs_path80.cc.jj	2025-05-06 15:48:48.686747631 +0200
 +++ libstdc++-v3/src/nonshared17/fs_path80.cc	2025-05-07 08:27:23.223419752 +0200
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,167 @@
 +// Copyright (C) 2019-2025 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@ -8559,12 +8586,13 @@
 +#endif
 +//asm (".hidden _ZNSt12_Destroy_auxILb0EE9__destroyIPNSt10filesystem7__cxx114path5_CmptEEEvT_S7_");
 +//asm (".hidden _ZNKSt10filesystem7__cxx114path5_List5_Impl4copyEv");
-+#if defined(__aarch64__) || defined(__s390x__)
-+//asm (".hidden _ZNSt10filesystem7__cxx114path5_List5beginEv");
-+//asm (".hidden _ZNSt10filesystem7__cxx114path7_Parser4nextEv");
-+#endif
 +#ifdef __aarch64__
 +asm (".hidden _ZNSt10filesystem7__cxx114path10_S_convertIwEEDaPKT_S5_"); // bad ppc64le
+asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm");
+asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE6resizeEmw");
+asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE9_M_mutateEmmPKwm");
+//asm (".hidden _ZNSt10filesystem7__cxx114path7_Parser4nextEv");
+//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc");
 +#endif
 +asm (".hidden _ZNSt10filesystem7__cxx114path8_CodecvtIwED2Ev");
 +asm (".hidden _ZNSt10filesystem7__cxx114path8_CodecvtIwED1Ev");
@ -8586,34 +8614,37 @@
 +asm (".hidden _ZNSt12system_errorC2ESt10error_codeRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_assignERKS4_");
 +#ifndef __i386__
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_appendEPKcm");
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE6resizeEmw");
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7reserveEm");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_mutateEmmPKcm");
 +//asm (".hidden _ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE24_M_release_last_use_coldEv");
 +//asm (".hidden _ZNSt12_Destroy_auxILb0EE9__destroyIPNSt10filesystem7__cxx114path5_CmptEEEvT_S7_");
 +//asm (".hidden _ZNKSt10filesystem7__cxx114path5_List5_Impl4copyEv");
 +#endif
-+#if  defined(__aarch64__) || defined(__x86_64__)
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE9_M_mutateEmmPKwm");
-+#endif
 +#ifdef __powerpc64__
-+//asm (".hidden _ZNSt10filesystem7__cxx114path5_List5beginEv");
 +//asm (".hidden _ZNSt10filesystem7__cxx114path7_Parser4nextEv");
 +#endif
+#ifdef __s390x__
+asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm");
+asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc");
+asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE6resizeEmw");
+#endif
 +#ifdef __x86_64__
-+//asm (".hidden _ZNSt10filesystem7__cxx114path5_List5beginEv");
+asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm");
+asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE6resizeEmw");
+asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE9_M_mutateEmmPKwm");
 +//asm (".hidden _ZNSt10filesystem7__cxx114path7_Parser4nextEv");
+asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc");
 +#endif
 +#ifdef __i386__
-+//asm (".hidden _ZNSt10filesystem7__cxx114path5_List5beginEv");
+asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEjjPKcj");
+asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEjc");
+asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE9_M_mutateEjjPKwj");
 +//asm (".hidden _ZNSt10filesystem7__cxx114path7_Parser4nextEv");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEjjPKcj");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7reserveEj");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_appendEPKcj");
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE6resizeEjw");
+asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE6resizeEjw");
 +#endif
 +asm (".hidden _ZNSt10filesystem7__cxx114path8_CodecvtIwED0Ev");
 +asm (".hidden _ZNSt10filesystem7__cxx114path8_CodecvtIwED1Ev");
@ -8632,9 +8663,10 @@
 +asm (".hidden _ZNSt10filesystem7__cxx114path19preferred_separatorE");
 +asm (".hidden _ZNSt19_UninitDestroyGuardIPNSt10filesystem7__cxx114path5_CmptEvED1Ev");
 +asm (".hidden _ZNSt19_UninitDestroyGuardIPNSt10filesystem7__cxx114path5_CmptEvED2Ev");
+asm (".hidden _ZNSt10filesystem7__cxx114path5_List5beginEv");
 --- libstdc++-v3/src/nonshared17/cow-fs_dir.cc.jj	2025-05-06 15:48:48.687747618 +0200
 +++ libstdc++-v3/src/nonshared17/cow-fs_dir.cc	2025-05-07 08:16:13.899587643 +0200
-@@ -0,0 +1,107 @@
+@@ -0,0 +1,111 @@
 +// Copyright (C) 2019-2025 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@ -8726,12 +8758,12 @@
 +asm (".hidden _ZNSt5dequeINSt10filesystem4_DirESaIS1_EE17_M_reallocate_mapEmb");
 +asm (".hidden _ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE24_M_release_last_use_coldEv");
 +#endif
-+#ifndef __powerpc64__
-+asm (".hidden _ZNSt10unique_ptrINSt10filesystem4path5_List5_ImplENS2_13_Impl_deleterEED1Ev");
-+asm (".hidden _ZNSt10unique_ptrINSt10filesystem4path5_List5_ImplENS2_13_Impl_deleterEED2Ev");
+#if defined(__s390x__)
+//asm (".hidden _ZNSt10unique_ptrINSt10filesystem4path5_List5_ImplENS2_13_Impl_deleterEED1Ev");
+//asm (".hidden _ZNSt10unique_ptrINSt10filesystem4path5_List5_ImplENS2_13_Impl_deleterEED2Ev");
 +#endif
 +#ifdef __i386__
-+//asm (".hidden _ZNSt5dequeINSt10filesystem4_DirESaIS1_EE17_M_reallocate_mapEjb");
+asm (".hidden _ZNSt5dequeINSt10filesystem4_DirESaIS1_EE17_M_reallocate_mapEjb");
 +#endif
 +asm (".hidden _ZNKSt10filesystem4_Dir11open_subdirEbbRSt10error_code");
 +asm (".hidden _ZNKSt10filesystem28recursive_directory_iterator10_Dir_stack12current_pathEv");
@ -8739,12 +8771,16 @@
 +//asm (".hidden _ZNSt10filesystem4pathC1ISsS0_EERKT_NS0_6formatE");
 +asm (".hidden _ZNSt10filesystem28recursive_directory_iterator7__eraseEPSt10error_code");
 +//asm (".hidden _ZNKSt10filesystem4_Dir16dir_and_pathnameEv");
-+//asm (".hidden _ZNSt10filesystem4pathD1Ev");
-+//asm (".hidden _ZNSt10filesystem4pathD2Ev");
-+//asm (".hidden _ZNKSt10filesystem4_Dir7currentEv");
+#ifndef __powerpc64__
+asm (".hidden _ZNKSt10filesystem4_Dir7currentEv");
+#endif
+#if defined (__x86_64__) || defined(__i386__) || defined(__s390x__)
+asm (".hidden _ZNSt10filesystem4pathD1Ev");
+asm (".hidden _ZNSt10filesystem4pathD2Ev");
+#endif
 --- libstdc++-v3/src/nonshared17/Makefile.am.jj	2025-05-06 15:48:48.687747618 +0200
 +++ libstdc++-v3/src/nonshared17/Makefile.am	2025-05-06 16:10:20.603262671 +0200
-@@ -0,0 +1,174 @@
+@@ -0,0 +1,155 @@
 +## Makefile for the C++17 sources of the GNU C++ Standard library.
 +##
 +## Copyright (C) 1997-2025 Free Software Foundation, Inc.
@ -8839,25 +8875,6 @@
 +libnonshared17convenience110_la_SOURCES = $(sources110) $(inst_sources110)
 +libnonshared17convenience140_la_SOURCES = $(sources140) $(inst_sources140)
 +
-+if GLIBCXX_LDBL_ALT128_COMPAT
-+floating_from_chars.lo: floating_from_chars.cc
-+	$(LTCXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+floating_from_chars.o: floating_from_chars.cc
-+	$(CXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+floating_to_chars.lo: floating_to_chars.cc
-+	$(LTCXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+floating_to_chars.o: floating_to_chars.cc
-+	$(CXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+floating_from_chars110.lo: floating_from_chars110.cc
-+	$(LTCXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+floating_from_chars110.o: floating_from_chars110.cc
-+	$(CXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+floating_to_chars110.lo: floating_to_chars110.cc
-+	$(LTCXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+floating_to_chars110.o: floating_to_chars110.cc
-+	$(CXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+endif
-+
 +# AM_CXXFLAGS needs to be in each subdirectory so that it can be
 +# modified in a per-library or per-sub-library way.  Need to manually
 +# set this option because CONFIG_CXXFLAGS has to be after
@ -8947,7 +8964,7 @@
 +#include "../c++17/cow-string-inst.cc"
 --- libstdc++-v3/src/nonshared17/Makefile.in.jj	2025-05-06 15:48:48.688747604 +0200
 +++ libstdc++-v3/src/nonshared17/Makefile.in	2025-05-07 10:09:21.643442963 +0200
-@@ -0,0 +1,871 @@
+@@ -0,0 +1,854 @@
 +# Makefile.in generated by automake 1.15.1 from Makefile.am.
 +# @configure_input@
 +
@ -9799,23 +9816,6 @@
 +
 +vpath % $(top_srcdir)/src/nonshared17
 +
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@floating_from_chars.lo: floating_from_chars.cc
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@	$(LTCXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@floating_from_chars.o: floating_from_chars.cc
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@	$(CXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@floating_to_chars.lo: floating_to_chars.cc
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@	$(LTCXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@floating_to_chars.o: floating_to_chars.cc
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@	$(CXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@floating_from_chars110.lo: floating_from_chars110.cc
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@	$(LTCXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@floating_from_chars110.o: floating_from_chars110.cc
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@	$(CXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@floating_to_chars110.lo: floating_to_chars110.cc
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@	$(LTCXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@floating_to_chars110.o: floating_to_chars110.cc
-+@GLIBCXX_LDBL_ALT128_COMPAT_TRUE@	$(CXXCOMPILE) -mabi=ibmlongdouble $(LONG_DOUBLE_128_FLAGS) -c $<
-+
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
@ -9875,7 +9875,7 @@
 +#include "../c++17/ostream-inst.cc"
 --- libstdc++-v3/src/nonshared17/floating_to_chars.cc.jj	2025-05-06 15:48:48.689747591 +0200
 +++ libstdc++-v3/src/nonshared17/floating_to_chars.cc	2025-05-07 08:26:03.148516563 +0200
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,103 @@
 +// Copyright (C) 2019-2025 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@ -9974,9 +9974,11 @@
 +asm (".hidden _ZNSt8__detail18__to_chars_10_implImEEvPcjT_");
 +#endif
 +#if !defined(__i386__) && !defined(__s390x__)
-+asm (".hidden _ZSt12__to_chars_iIoESt15to_chars_resultPcS1_T_i");
 +asm (".hidden _ZSt13__countl_zeroIoEiT_");
 +#endif
+#if !defined(__i386__)
+asm (".hidden _ZSt12__to_chars_iIoESt15to_chars_resultPcS1_T_i");
+#endif
 --- libstdc++-v3/src/nonshared17/cow-string-inst110.cc.jj	2025-05-06 15:48:48.689747591 +0200
 +++ libstdc++-v3/src/nonshared17/cow-string-inst110.cc	2025-05-06 15:48:48.689747591 +0200
@@ -0,0 +1,37 @@
--- a/gcc15-pr123273.patch
+++ b/gcc15-pr123273.patch
@ -1,54 +0,0 @@
-2026-01-06  Jakub Jelinek  <jakub@redhat.com>
-
-	PR preprocessor/123273
-	* lex.cc (cpp_directive_only_process): Only go to done_comment
-	for '/' if star is true and esc is false.  When seeing '\\' with
-	esc set to true, clear esc as well as star instead of keeping esc
-	set.
-
-	* c-c++-common/cpp/dir-only-10.c: New test.
-	* c-c++-common/cpp/dir-only-11.c: New test.
-
--- libcpp/lex.cc.jj	2026-01-02 09:56:10.417332292 +0100
-+++ libcpp/lex.cc	2026-01-05 16:40:26.413766032 +0100
-@@ -5461,7 +5461,13 @@ cpp_directive_only_process (cpp_reader *
- 		    switch (c)
- 		      {
- 		      case '\\':
-			esc = true;
-+			if (esc)
-+			  {
-+			    star = false;
-+			    esc = false;
-+			  }
-+			else
-+			  esc = true;
- 			break;
- 
- 		      case '\r':
-@@ -5492,7 +5498,7 @@ cpp_directive_only_process (cpp_reader *
- 			break;
- 
- 		      case '/':
-			if (star)
-+			if (star && !esc)
- 			  goto done_comment;
- 			/* FALLTHROUGH  */
- 
--- gcc/testsuite/c-c++-common/cpp/dir-only-10.c.jj	2026-01-05 17:04:26.144566116 +0100
-+++ gcc/testsuite/c-c++-common/cpp/dir-only-10.c	2026-01-05 17:05:02.226946201 +0100
-@@ -0,0 +1,5 @@
-+/* PR preprocessor/123273 */
-+/* { dg-do preprocess } */
-+/* { dg-options -fdirectives-only } */
-+
-+/* *\/""" */
--- gcc/testsuite/c-c++-common/cpp/dir-only-11.c.jj	2026-01-05 17:05:18.498666647 +0100
-+++ gcc/testsuite/c-c++-common/cpp/dir-only-11.c	2026-01-05 17:06:17.574651691 +0100
-@@ -0,0 +1,6 @@
-+/* PR preprocessor/123273 */
-+/* { dg-do preprocess } */
-+/* { dg-options -fdirectives-only } */
-+
-+/* *\\
-+/""" */
--- a/gcc15-pr123667.patch
+++ b/gcc15-pr123667.patch
@ -1,94 +0,0 @@
-2026-01-21  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/123667
-	* semantics.cc (finish_decltype_type): Allow a structured binding
-	for ptds.saved to have DECL_HAS_VALUE_EXPR_P cleared, if it is
-	not within current_function_decl, but in that case assert that
-	lookup_decomp_type succeeded.
-
-	* g++.dg/cpp1z/decomp66.C: New test.
-	* g++.dg/cpp1z/decomp67.C: New test.
-
--- gcc/cp/semantics.cc.jj	2026-01-15 16:33:46.000000000 +0100
-+++ gcc/cp/semantics.cc	2026-01-21 17:55:14.272577246 +0100
-@@ -13062,12 +13062,16 @@ finish_decltype_type (tree expr, bool id
- 	{
- 	  if (ptds.saved)
- 	    {
-	      gcc_checking_assert (DECL_HAS_VALUE_EXPR_P (expr));
-+	      gcc_checking_assert (DECL_HAS_VALUE_EXPR_P (expr)
-+				   || (DECL_CONTEXT (expr)
-+				       != current_function_decl));
- 	      /* DECL_HAS_VALUE_EXPR_P is always set if
-		 processing_template_decl.  If lookup_decomp_type
-+		 processing_template_decl at least for structured bindings
-+		 within the template.  If lookup_decomp_type
- 		 returns non-NULL, it is the tuple case.  */
- 	      if (tree ret = lookup_decomp_type (expr))
- 		return ret;
-+	      gcc_checking_assert (DECL_HAS_VALUE_EXPR_P (expr));
- 	    }
- 	  if (DECL_HAS_VALUE_EXPR_P (expr))
- 	    /* Expr is an array or struct subobject proxy, handle
--- gcc/testsuite/g++.dg/cpp1z/decomp66.C.jj	2026-01-21 17:59:28.122275457 +0100
-+++ gcc/testsuite/g++.dg/cpp1z/decomp66.C	2026-01-21 17:58:30.737247916 +0100
-@@ -0,0 +1,23 @@
-+// PR c++/123667
-+// { dg-do compile { target c++14 } }
-+// { dg-options "" }
-+
-+namespace std {
-+  template <typename T> struct tuple_size;
-+  template <int, typename> struct tuple_element;
-+}
-+
-+struct A {
-+  int i;
-+  template <int I> int &get () { return i; }
-+};
-+
-+template <> struct std::tuple_size <A> { static const int value = 2; };
-+template <int I> struct std::tuple_element <I,A> { using type = int; };
-+
-+int
-+main ()
-+{
-+  auto [ x, y ] = A { 0 };	// { dg-warning "structured bindings only available with" "" { target c++14_down } }
-+  [] (auto t) { using z = decltype (x); } (1);
-+}
--- gcc/testsuite/g++.dg/cpp1z/decomp67.C.jj	2026-01-21 17:59:31.139224331 +0100
-+++ gcc/testsuite/g++.dg/cpp1z/decomp67.C	2026-01-21 17:59:07.235629406 +0100
-@@ -0,0 +1,33 @@
-+// PR c++/123667
-+// { dg-do compile { target c++11 } }
-+// { dg-options "" }
-+
-+namespace std {
-+  template <typename T> struct tuple_size;
-+  template <int, typename> struct tuple_element;
-+}
-+
-+struct A {
-+  int i;
-+  template <int I> int &get () { return i; }
-+};
-+
-+template <> struct std::tuple_size <A> { static const int value = 2; };
-+template <int I> struct std::tuple_element <I,A> { using type = int; };
-+
-+auto [ x, y ] = A { 0 };	// { dg-warning "structured bindings only available with" "" { target c++14_down } }
-+
-+template <int N>
-+void
-+foo ()
-+{
-+  using a = decltype (x);
-+  auto [ x, y ] = A { 0 };	// { dg-warning "structured bindings only available with" "" { target c++14_down } }
-+  using b = decltype (x);
-+}
-+
-+void
-+bar ()
-+{
-+  foo <42> ();
-+}
--- a/gcc15-pr123737.patch
+++ b/gcc15-pr123737.patch
@ -1,86 +0,0 @@
-2026-01-21  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/123737
-	* parser.cc (cp_parser_expression): Don't handle CPP_EMBED just
-	as the last byte in it if expression has or might have overloaded
-	type.  In that case call build_x_compound_expr for each byte
-	in CPP_EMBED separately.
-
-	* g++.dg/cpp/embed-28.C: New test.
-	* g++.dg/parse/comma3.C: New test.
-
--- gcc/cp/parser.cc.jj	2026-01-20 01:13:20.324260446 +0100
-+++ gcc/cp/parser.cc	2026-01-21 14:04:32.086336386 +0100
-@@ -12132,10 +12132,24 @@ cp_parser_expression (cp_parser* parser,
- 	     and one CPP_NUMBER plus CPP_COMMA before it and one
- 	     CPP_COMMA plus CPP_NUMBER after it is guaranteed by
- 	     the preprocessor.  Thus, parse the whole CPP_EMBED just
-	     as a single INTEGER_CST, the last byte in it.  */
-+	     as a single INTEGER_CST, the last byte in it.  Though,
-+	     don't use that shortcut if the comma operator could be
-+	     overloaded.  */
- 	  tree raw_data = cp_lexer_peek_token (parser->lexer)->u.value;
- 	  location_t loc = cp_lexer_peek_token (parser->lexer)->location;
- 	  cp_lexer_consume_token (parser->lexer);
-+	  if (OVERLOAD_TYPE_P (TREE_TYPE (expression))
-+	      || type_dependent_expression_p (expression))
-+	    for (unsigned i = 0; i < RAW_DATA_LENGTH (raw_data) - 1U; ++i)
-+	      {
-+		assignment_expression
-+		  = *raw_data_iterator (raw_data, i);
-+		assignment_expression.set_location (loc);
-+		expression
-+		  = build_x_compound_expr (loc, expression,
-+					   assignment_expression, NULL_TREE,
-+					   complain_flags (decltype_p));
-+	      }
- 	  assignment_expression
- 	    = *raw_data_iterator (raw_data, RAW_DATA_LENGTH (raw_data) - 1);
- 	  assignment_expression.set_location (loc);
--- gcc/testsuite/g++.dg/cpp/embed-28.C.jj	2026-01-21 14:11:14.617520864 +0100
-+++ gcc/testsuite/g++.dg/cpp/embed-28.C	2026-01-21 14:11:01.121749695 +0100
-@@ -0,0 +1,19 @@
-+// PR c++/123737
-+// { dg-do run }
-+// { dg-options "--embed-dir=${srcdir}/c-c++-common/cpp/embed-dir" }
-+
-+struct A {
-+  A (int x) : a (0), e (x) {}
-+  unsigned long a, e;
-+  A &operator, (int) { ++a; return *this; }
-+  ~A () { if (a != e) __builtin_abort (); }
-+};
-+
-+int
-+main ()
-+{
-+  A a = 231;
-+  a,
-+#embed <magna-carta.txt> limit (231)
-+    ;
-+}
--- gcc/testsuite/g++.dg/parse/comma3.C.jj	2026-01-21 14:08:53.834908004 +0100
-+++ gcc/testsuite/g++.dg/parse/comma3.C	2026-01-21 12:15:02.334948163 +0100
-@@ -0,0 +1,22 @@
-+// PR c++/123737
-+// { dg-do run }
-+
-+struct A {
-+  A (int x) : a (0), e (x) {}
-+  unsigned long a, e;
-+  A &operator, (int) { ++a; return *this; }
-+  ~A () { if (a != e) __builtin_abort (); }
-+};
-+
-+int
-+main ()
-+{
-+  A a = 131;
-+  a, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0;
-+}
--- a/plans/tier0.fmf
+++ b/plans/tier0.fmf
@ -9,9 +9,10 @@
 ---
 summary: Tier 0 test plan
 context:
-  component: gcc-toolset-15-gcc
+  collection: gcc-toolset-15
 environment+:
-  WITH_SCL: gcc-toolset-15-env
+  COLLECTIONS: gcc-toolset-15
+  WITH_SCL: "scl enable gcc-toolset-15"
 discover:
  - name: collect_info
    how: shell
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-SHA512 (gcc-15.2.1-20260123.tar.xz) = c4f0513e4027632f2d62b1feead9fa197e46f796212bd7f07eaff9b2e84a1230b601f3a6f2cabfc9994ca0e47f95b21fcb9a182575a27e30100e3206d6767070
+SHA512 (gcc-15.1.1-20250521.tar.xz) = 86b06902e10aa6eba4ccbe54e97fee17838e21484e4f6d4aef2e93d0687b04e82f00655828ac0233f4026cd0d2df08bbdfe7dc2eeafc8908cab183584d2fb8ee
 SHA512 (isl-0.24.tar.bz2) = aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95
 SHA512 (newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz) = ef9495745a96d1d76f9f425c4a48c807fface36a1aa92351c5d024103678d144d046e8de55d195103784472c14874e29e4b9284d5d6a2e7bb27fd98c8455a881
 SHA512 (nvptx-tools-87ce9dc5999e5fca2e1d3478a30888d9864c9804.tar.xz) = 941e763af8601b89f0e4ec48a2d68ae0a8e70ee1e6ba6859394b021ad7bd7d143cc529f3c35c08d7f84e5554980ddcc97cf05b6c4755c2bc36c91161b79e8cea