From: Jonathan Wakely <jwakely@redhat.com>
To: Andreas Schwab <schwab@suse.de>
Cc: Jakub Jelinek <jakub@redhat.com>,
libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] libstdc++: Regenerate baseline_symbols.txt files for Linux
Date: Thu, 11 Apr 2024 15:16:02 +0100 [thread overview]
Message-ID: <CACb0b4=rb4NfJ3RLib101ZeCSKSCX3GAdC2KEzVtno_ChfjYRQ@mail.gmail.com> (raw)
In-Reply-To: <CACb0b4kutCE_oO11Dwg5-CqZxM6-P05rdTsYyMt6ZgO3XE5F=w@mail.gmail.com>
On Thu, 11 Apr 2024 at 15:13, Jonathan Wakely <jwakely@redhat.com> wrote:
>
> On Thu, 11 Apr 2024 at 15:12, Andreas Schwab <schwab@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).
next prev parent reply other threads:[~2024-04-11 14:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 13:51 Jakub Jelinek
2024-04-11 13:53 ` Jonathan Wakely
2024-04-11 13:59 ` [PATCH] libstdc++: Regenerate baseline_symbols.txt files for i386-linux-gnu Jonathan Wakely
2024-04-11 14:06 ` Jakub Jelinek
2024-04-11 14:07 ` Jonathan Wakely
2024-04-11 14:11 ` [PATCH] libstdc++: Regenerate baseline_symbols.txt files for Linux Andreas Schwab
2024-04-11 14:13 ` Jonathan Wakely
2024-04-11 14:16 ` Jonathan Wakely [this message]
2024-04-11 14:18 ` Jakub Jelinek
-- strict thread matches above, loose matches on Subject: below --
2023-05-02 8:45 Jakub Jelinek
2023-05-02 15:42 ` Jonathan Wakely
2023-05-02 15:50 ` Jakub Jelinek
2023-05-02 17:32 ` Jakub Jelinek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACb0b4=rb4NfJ3RLib101ZeCSKSCX3GAdC2KEzVtno_ChfjYRQ@mail.gmail.com' \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=libstdc++@gcc.gnu.org \
--cc=schwab@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).