On Thu, 11 Apr 2024 at 15:13, Jonathan Wakely <jwak...@redhat.com> wrote: > > On Thu, 11 Apr 2024 at 15:12, Andreas Schwab <sch...@suse.de> wrote: > > > > On Apr 11 2024, Jakub Jelinek wrote: > > > > > --- libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt.jj > > > 2023-05-04 09:42:43.277271065 +0200 > > > +++ libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt > > > 2024-04-11 15:44:07.113985138 +0200 > > > @@ -3214,6 +3214,7 @@ FUNC:_ZNSt7__cxx1112basic_stringIcSt11ch > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEjjPKcj@@GLIBCXX_3.4.21 > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_S_compareEjj@@GLIBCXX_3.4.21 > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE11_M_capacityEj@@GLIBCXX_3.4.21 > > > +FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE11_S_allocateERS3_j@@GLIBCXX_3.4.32 > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC1EPcOS3_@@GLIBCXX_3.4.23 > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC1EPcRKS3_@@GLIBCXX_3.4.21 > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC2EPcOS3_@@GLIBCXX_3.4.23 > > > @@ -3366,6 +3367,7 @@ FUNC:_ZNSt7__cxx1112basic_stringIwSt11ch > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE10_M_replaceEjjPKwj@@GLIBCXX_3.4.21 > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE10_S_compareEjj@@GLIBCXX_3.4.21 > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE11_M_capacityEj@@GLIBCXX_3.4.21 > > > +FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE11_S_allocateERS3_j@@GLIBCXX_3.4.32 > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE12_Alloc_hiderC1EPwOS3_@@GLIBCXX_3.4.23 > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE12_Alloc_hiderC1EPwRKS3_@@GLIBCXX_3.4.21 > > > > > > FUNC:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE12_Alloc_hiderC2EPwOS3_@@GLIBCXX_3.4.23 > > > > That does not fit. > > > > diff --git > > a/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt > > b/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt > > index 975e7e97cbf..0ac915dc01b 100644 > > --- a/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt > > +++ b/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt > > @@ -497,6 +497,7 @@ FUNC:_ZNKSt11__timepunctIwE7_M_daysEPPKw@@GLIBCXX_3.4 > > FUNC:_ZNKSt11__timepunctIwE8_M_am_pmEPPKw@@GLIBCXX_3.4 > > FUNC:_ZNKSt11__timepunctIwE9_M_monthsEPPKw@@GLIBCXX_3.4 > > FUNC:_ZNKSt11logic_error4whatEv@@GLIBCXX_3.4 > > +FUNC:_ZNKSt12__basic_fileIcE13native_handleEv@@GLIBCXX_3.4.32 > > That symbol should not be in this symver, see > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114692 and > https://gcc.gnu.org/pipermail/gcc-patches/2024-April/649260.html
Jakub's patch is just adding the symbols from gcc-13.2.0 which should be in the baselines for both gcc-13 and trunk. After that's done I can fix PR114692 and then we can regen the baselines for trunk, which will include the __cxa_call_terminate@@CXXABI_1.3.15 symbol, but also have _ZNKSt12__basic_fileIcE13native_handleEv@@GLIBCXX_3.4.33 (N.B. 3.4.33 not 3.4.32).
