From 17dd651aec9d8da6c4e644711d042ce6c7b2157f Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Thu, 8 Jun 2023 13:19:05 -0400
Subject: [PATCH] Tweak gcc13-libstdc++-compat

Resolves: #2188498
---
 gcc.spec                     |   2 -
 gcc13-libstdc++-compat.patch | 120 +++++++++++++++++------------------
 2 files changed, 58 insertions(+), 64 deletions(-)

diff --git a/gcc.spec b/gcc.spec
index 7ee105e..41a4733 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1976,8 +1976,6 @@ popd
 %endif
 
 %check
-# TODO
-exit 0
 cd obj-%{gcc_target_platform}
 
 %{?scl:PATH=%{_bindir}${PATH:+:${PATH}}}
diff --git a/gcc13-libstdc++-compat.patch b/gcc13-libstdc++-compat.patch
index f7bbcfa..2c8f7f1 100644
--- a/gcc13-libstdc++-compat.patch
+++ b/gcc13-libstdc++-compat.patch
@@ -8569,7 +8569,7 @@
 +#endif
 +asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_disposeEv");
 +asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE10_M_disposeEv");
-+#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__aarch64__)
 +asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE9_M_mutateEmmPKwm");
 +#endif
 --- libstdc++-v3/src/nonshared20/tzdb.cc.jj	2023-05-19 14:48:48.951405987 +0200
@@ -8797,7 +8797,7 @@
 +	$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
 --- libstdc++-v3/src/nonshared20/tzdb80.cc.jj	2023-05-19 20:25:50.447297532 +0200
 +++ libstdc++-v3/src/nonshared20/tzdb80.cc	2023-05-19 19:51:19.200552634 +0200
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,105 @@
 +// Copyright The GNU Toolchain Authors.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@@ -8899,6 +8899,10 @@
 +asm (".hidden _ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE");
 +asm (".hidden _ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag");
 +asm (".hidden _ZZNSt8__detail18__waiter_pool_base6_S_forEPKvE3__w");
++#if defined(__x86_64__) || defined(__aarch64__)
++asm (".hidden _ZNKSt10filesystem7__cxx114path8iteratordeEv");
++#endif
++asm (".hidden _ZSt23__atomic_wait_address_vIiZNKSt13__atomic_baseIiE4waitEiSt12memory_orderEUlvE_EvPKT_S4_T0_");
 --- libstdc++-v3/src/nonshared20/Makefile.in.jj	2023-05-19 12:22:56.773881666 +0200
 +++ libstdc++-v3/src/nonshared20/Makefile.in	2023-05-19 20:27:53.348560551 +0200
 @@ -0,0 +1,791 @@
@@ -9817,7 +9821,7 @@
  } // namespace std
 --- libstdc++-v3/src/nonshared17/floating_from_chars.cc.jj	2023-05-19 12:22:56.798881312 +0200
 +++ libstdc++-v3/src/nonshared17/floating_from_chars.cc	2023-05-19 19:52:38.332436134 +0200
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,44 @@
 +// Copyright (C) 2019-2023 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@@ -9860,9 +9864,7 @@
 +//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
-+#ifndef __s390x__
 +asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcENSt3pmr21polymorphic_allocatorIcEEE15_M_replace_coldEPcmPKcmm");
-+#endif
 +asm (".hidden _ZNSt8__detail31__from_chars_alnum_to_val_tableILb0EE5valueE");
 --- libstdc++-v3/src/nonshared17/floating_from_chars110.cc.jj	2023-05-19 18:08:44.662186963 +0200
 +++ libstdc++-v3/src/nonshared17/floating_from_chars110.cc	2023-05-19 19:46:37.242530879 +0200
@@ -9901,7 +9903,7 @@
 +asm (".hidden _ZNSt8__detail31__from_chars_alnum_to_val_tableILb0EE5valueE");
 --- libstdc++-v3/src/nonshared17/cow-fs_ops.cc.jj	2023-05-19 12:22:56.799881298 +0200
 +++ libstdc++-v3/src/nonshared17/cow-fs_ops.cc	2023-05-19 19:21:04.451145483 +0200
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,83 @@
 +// Copyright (C) 2019-2023 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@@ -9941,19 +9943,18 @@
 +//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");
 +asm (".hidden _ZNSt5dequeINSt10filesystem4pathESaIS1_EE13_M_insert_auxINS1_8iteratorEEEvSt15_Deque_iteratorIS1_RS1_PS1_ET_SA_m");
 +asm (".hidden _ZNSt5dequeINSt10filesystem4pathESaIS1_EE17_M_reallocate_mapEmb");
 +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
++asm (".hidden _ZNSt10filesystem4pathD2Ev");
++asm (".hidden _ZNSt10filesystem4pathD1Ev");
++asm (".hidden _ZNSs9_M_mutateEmmm");
++asm (".hidden _ZNSs6resizeEmc");
 +#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_");
@@ -9970,17 +9971,19 @@
 +//asm (".hidden _ZSt4moveISt15_Deque_iteratorINSt10filesystem4pathERS2_PS2_ES5_ET0_T_S7_S6_");
 +#endif
 +#if defined(__s390x__)
-+//asm (".hidden _ZSt16__do_uninit_copyINSt10filesystem4path8iteratorESt15_Deque_iteratorIS1_RS1_PS1_EET0_T_S8_S7_");
++asm (".hidden _ZNSs4swapERSs");
++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_");
 +#endif
 +#ifdef __aarch64__
++asm (".hidden _ZNSs4swapERSs");
 +//asm (".hidden _ZSt4copyINSt10filesystem4path8iteratorESt15_Deque_iteratorIS1_RS1_PS1_EET0_T_S8_S7_");
 +//asm (".hidden _ZSt13move_backwardISt15_Deque_iteratorINSt10filesystem4pathERS2_PS2_ES5_ET0_T_S7_S6_");
 +//asm (".hidden _ZSt4moveISt15_Deque_iteratorINSt10filesystem4pathERS2_PS2_ES5_ET0_T_S7_S6_");
 +#endif
 +asm (".hidden _ZNKSt10filesystem4path8filenameEv");
 +#ifdef __powerpc64__
-+//asm (".hidden _ZSt16__do_uninit_copyINSt10filesystem4path8iteratorESt15_Deque_iteratorIS1_RS1_PS1_EET0_T_S8_S7_");
++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
@@ -10030,7 +10033,7 @@
 +std::__shared_ptr<fs::recursive_directory_iterator::_Dir_stack>::operator bool () const noexcept;
 --- libstdc++-v3/src/nonshared17/cow-fs_path.cc.jj	2023-05-19 12:22:56.799881298 +0200
 +++ libstdc++-v3/src/nonshared17/cow-fs_path.cc	2023-05-19 19:54:08.960157436 +0200
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,128 @@
 +// Copyright (C) 2019-2023 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@@ -10111,29 +10114,27 @@
 +//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");
++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 _ZNSs4swapERSs");
++asm (".hidden _ZNSs6appendERKSs");
++asm (".hidden _ZNSs6insertEmPKcm");
++asm (".hidden _ZNSs6resizeEmc");
++asm (".hidden _ZNSs7reserveEm");
++asm (".hidden _ZNSsC1ERKSsmm");
++asm (".hidden _ZNSs9_M_mutateEmmm");
++asm (".hidden _ZNSsC2ERKSsmm");
++asm (".hidden _ZNSt10filesystem4path5_List5beginEv");
++asm (".hidden _ZNSt10filesystem4path7_Parser4nextEv");
++asm (".hidden _ZNSt10filesystem4pathD1Ev");
++asm (".hidden _ZSt16__do_str_codecvtISswSt7codecvtIwc11__mbstate_tES1_MS2_KFNSt12codecvt_base6resultERS1_PKwS7_RS7_PcS9_RS9_EEbPKT0_SF_RT_RKT1_RT2_RmT3_");
++asm (".hidden _ZNSt10filesystem4pathD2Ev");
 +#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");
 +#endif
 +#ifdef __i386__
 +//asm (".hidden _ZNSbIwSt11char_traitsIwESaIwEE6resizeEjw");
@@ -10231,7 +10232,7 @@
 +#ifdef __powerpc64__
 +//asm (".hidden _ZNSt3pmr15__pool_resource5_Pool10deallocateEPNS_15memory_resourceEPv");
 +#endif
-+//asm (".hidden _ZNSt22__shared_mutex_pthread6unlockEv");
++asm (".hidden _ZNSt22__shared_mutex_pthread6unlockEv");
 --- libstdc++-v3/src/nonshared17/fs_dir.cc.jj	2023-05-19 12:22:56.799881298 +0200
 +++ libstdc++-v3/src/nonshared17/fs_dir.cc	2023-05-19 19:49:09.012389503 +0200
 @@ -0,0 +1,103 @@
@@ -10335,12 +10336,12 @@
 +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");
++asm (".hidden _ZNKSt10filesystem7__cxx114_Dir7currentEv");
 +asm (".hidden _ZNSt10filesystem7__cxx114_DirC1ERKNS0_4pathEbbbRSt10error_code");
 +asm (".hidden _ZNSt10filesystem7__cxx114_DirC2ERKNS0_4pathEbbbRSt10error_code");
 --- libstdc++-v3/src/nonshared17/fs_ops80.cc.jj	2023-05-19 12:22:56.800881284 +0200
 +++ libstdc++-v3/src/nonshared17/fs_ops80.cc	2023-05-19 19:23:32.266062865 +0200
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,39 @@
 +// Copyright (C) 2019-2023 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@@ -10369,13 +10370,11 @@
 +//asm (".hidden _ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE24_M_release_last_use_coldEv");
 +#endif
 +#if defined(__s390x__) || defined(__powerpc64__)
-+//asm (".hidden _ZSt16__do_uninit_copyINSt10filesystem7__cxx114path8iteratorESt15_Deque_iteratorIS2_RS2_PS2_EET0_T_S9_S8_");
++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_");
-+//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc");
-+#endif
++asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4swapERS4_");
++asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc");
 +#ifdef __i386__
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4swapERS4_");
 +//asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEjc");
@@ -10384,7 +10383,7 @@
 +#endif
 --- libstdc++-v3/src/nonshared17/fs_path80.cc.jj	2023-05-19 12:22:56.800881284 +0200
 +++ libstdc++-v3/src/nonshared17/fs_path80.cc	2023-05-19 19:53:32.875666566 +0200
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,77 @@
 +// Copyright (C) 2019-2023 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@@ -10421,26 +10420,24 @@
 +//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");
++#if defined(__aarch64__)
++asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE9_M_mutateEmmPKwm");
 +#endif
++asm (".hidden _ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE6resizeEmw");
++asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_appendEPKcm");
++asm (".hidden _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc");
++asm (".hidden _ZNSt10filesystem7__cxx114path5_List5beginEv");
++asm (".hidden _ZNSt10filesystem7__cxx114path7_Parser4nextEv");
 +#ifdef __powerpc64__
 +//asm (".hidden _ZNSt10filesystem7__cxx114path5_List5beginEv");
 +//asm (".hidden _ZNSt10filesystem7__cxx114path7_Parser4nextEv");
 +#endif
-+#ifdef __x86_64__
-+//asm (".hidden _ZNSt10filesystem7__cxx114path5_List5beginEv");
-+//asm (".hidden _ZNSt10filesystem7__cxx114path7_Parser4nextEv");
-+#endif
 +#ifdef __i386__
 +//asm (".hidden _ZNSt10filesystem7__cxx114path5_List5beginEv");
 +//asm (".hidden _ZNSt10filesystem7__cxx114path7_Parser4nextEv");
@@ -10466,7 +10463,7 @@
 +asm (".hidden _ZNSt10filesystem7__cxx114path19preferred_separatorE");
 --- libstdc++-v3/src/nonshared17/cow-fs_dir.cc.jj	2023-05-19 12:22:56.800881284 +0200
 +++ libstdc++-v3/src/nonshared17/cow-fs_dir.cc	2023-05-19 19:48:43.710746491 +0200
-@@ -0,0 +1,107 @@
+@@ -0,0 +1,109 @@
 +// Copyright (C) 2019-2023 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@@ -10571,9 +10568,11 @@
 +//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");
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
++asm (".hidden _ZNSt10filesystem4pathD1Ev");
++asm (".hidden _ZNSt10filesystem4pathD2Ev");
++#endif
++asm (".hidden _ZNKSt10filesystem4_Dir7currentEv");
 --- libstdc++-v3/src/nonshared17/Makefile.am.jj	2023-05-19 12:22:56.800881284 +0200
 +++ libstdc++-v3/src/nonshared17/Makefile.am	2023-05-19 20:24:10.011717009 +0200
 @@ -0,0 +1,148 @@
@@ -11834,7 +11833,7 @@
 +#include "../c++17/ostream-inst.cc"
 --- libstdc++-v3/src/nonshared17/floating_to_chars.cc.jj	2023-05-19 12:22:56.802881256 +0200
 +++ libstdc++-v3/src/nonshared17/floating_to_chars.cc	2023-05-19 19:31:01.427729696 +0200
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,90 @@
 +// Copyright (C) 2019-2023 Free Software Foundation, Inc.
 +//
 +// This file is part of the GNU ISO C++ Library.  This library is free
@@ -11884,9 +11883,6 @@
 +//asm (".hidden _ZSt12__to_chars_iIjENSt9enable_ifIXsrSt5__or_IIS1_IISt7is_sameINSt9remove_cvIT_E4typeEaES2_IS6_sES2_IS6_iES2_IS6_lES2_IS6_xES2_IS6_nEEES1_IIS2_IS6_hES2_IS6_tES2_IS6_jES2_IS6_mES2_IS6_yES2_IS6_oEEES2_IcS6_EEE5valueESt15to_chars_resultE4typeEPcSQ_S4_i");
 +//asm (".hidden _ZSt12__to_chars_iIjENSt9enable_ifIXsrSt5__or_IJS1_IJSt7is_sameINSt9remove_cvIT_E4typeEaES2_IS6_sES2_IS6_iES2_IS6_lES2_IS6_xES2_IS6_nEEES1_IJS2_IS6_hES2_IS6_tES2_IS6_jES2_IS6_mES2_IS6_yES2_IS6_oEEES2_IcS6_EEE5valueESt15to_chars_resultE4typeEPcSQ_S4_i");
 +#endif
-+#if defined (__i386__) || defined (__s390x__)
-+//asm (".hidden _ZNSt8__detail10__to_charsIjEESt15to_chars_resultPcS2_T_i");
-+#endif
 +#if defined (__powerpc64__) || defined (__s390x__)
 +//asm (".hidden _ZSt8to_charsPcS_g");
 +//asm (".hidden _ZSt8to_charsPcS_gSt12chars_format");
@@ -11895,8 +11891,6 @@
 +#if !defined (__powerpc64__) && !defined (__s390x__)
 +//asm (".hidden _ZNSt8__detail13__to_chars_16IoEENSt9enable_ifIXsrSt5__or_IIS2_IISt7is_sameINSt9remove_cvIT_E4typeEaES3_IS7_sES3_IS7_iES3_IS7_lES3_IS7_xES3_IS7_nEEES2_IIS3_IS7_hES3_IS7_tES3_IS7_jES3_IS7_mES3_IS7_yES3_IS7_oEEES3_IcS7_EEE5valueESt15to_chars_resultE4typeEPcSR_S5_");
 +//asm (".hidden _ZNSt8__detail13__to_chars_16IoEENSt9enable_ifIXsrSt5__or_IJS2_IJSt7is_sameINSt9remove_cvIT_E4typeEaES3_IS7_sES3_IS7_iES3_IS7_lES3_IS7_xES3_IS7_nEEES2_IJS3_IS7_hES3_IS7_tES3_IS7_jES3_IS7_mES3_IS7_yES3_IS7_oEEES3_IcS7_EEE5valueESt15to_chars_resultE4typeEPcSR_S5_");
-+asm (".hidden _ZSt12__to_chars_iIoENSt9enable_ifIXsrSt5__or_IIS1_IISt7is_sameINSt9remove_cvIT_E4typeEaES2_IS6_sES2_IS6_iES2_IS6_lES2_IS6_xES2_IS6_nEEES1_IIS2_IS6_hES2_IS6_tES2_IS6_jES2_IS6_mES2_IS6_yES2_IS6_oEEES2_IcS6_EEE5valueESt15to_chars_resultE4typeEPcSQ_S4_i");
-+asm (".hidden _ZSt12__to_chars_iIoENSt9enable_ifIXsrSt5__or_IJS1_IJSt7is_sameINSt9remove_cvIT_E4typeEaES2_IS6_sES2_IS6_iES2_IS6_lES2_IS6_xES2_IS6_nEEES1_IJS2_IS6_hES2_IS6_tES2_IS6_jES2_IS6_mES2_IS6_yES2_IS6_oEEES2_IcS6_EEE5valueESt15to_chars_resultE4typeEPcSQ_S4_i");
 +//asm (".hidden _ZZNSt8__detail13__to_chars_16IoEENSt9enable_ifIXsrSt5__or_IIS2_IISt7is_sameINSt9remove_cvIT_E4typeEaES3_IS7_sES3_IS7_iES3_IS7_lES3_IS7_xES3_IS7_nEEES2_IIS3_IS7_hES3_IS7_tES3_IS7_jES3_IS7_mES3_IS7_yES3_IS7_oEEES3_IcS7_EEE5valueESt15to_chars_resultE4typeEPcSR_S5_E8__digits");
 +//asm (".hidden _ZZNSt8__detail13__to_chars_16IoEENSt9enable_ifIXsrSt5__or_IJS2_IJSt7is_sameINSt9remove_cvIT_E4typeEaES3_IS7_sES3_IS7_iES3_IS7_lES3_IS7_xES3_IS7_nEEES2_IJS3_IS7_hES3_IS7_tES3_IS7_jES3_IS7_mES3_IS7_yES3_IS7_oEEES3_IcS7_EEE5valueESt15to_chars_resultE4typeEPcSR_S5_E8__digits");
 +//asm (".hidden _ZZNSt8__detail10__to_charsIoEESt15to_chars_resultPcS2_T_iE8__digits");
@@ -11928,6 +11922,8 @@
 +#endif
 +//asm (".hidden _ZZNSt8__detail10__to_charsIjEESt15to_chars_resultPcS2_T_iE8__digits");
 +asm (".hidden _ZNSt8__detail18__to_chars_10_implImEEvPcjT_");
++asm (".hidden _ZSt12__to_chars_iIoENSt9enable_ifIXsrSt5__or_IJS1_IJSt7is_sameINSt9remove_cvIT_E4typeEaES2_IS6_sES2_IS6_iES2_IS6_lES2_IS6_xES2_IS6_nEEES1_IJS2_IS6_hES2_IS6_tES2_IS6_jES2_IS6_mES2_IS6_yES2_IS6_oEEES2_IcS6_EEE5valueESt15to_chars_resultE4typeEPcSQ_S4_i");
++asm (".hidden _ZSt12__to_chars_iIoENSt9enable_ifIXsrSt5__or_IIS1_IISt7is_sameINSt9remove_cvIT_E4typeEaES2_IS6_sES2_IS6_iES2_IS6_lES2_IS6_xES2_IS6_nEEES1_IIS2_IS6_hES2_IS6_tES2_IS6_jES2_IS6_mES2_IS6_yES2_IS6_oEEES2_IcS6_EEE5valueESt15to_chars_resultE4typeEPcSQ_S4_i");
 --- libstdc++-v3/src/nonshared17/cow-string-inst110.cc.jj	2023-05-19 20:14:11.168179686 +0200
 +++ libstdc++-v3/src/nonshared17/cow-string-inst110.cc	2023-05-19 19:43:15.764373602 +0200
 @@ -0,0 +1,37 @@