| Message ID | 20230606155947.1242056-1-jwakely@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [committed] libstdc++: Update list of known symbol versions for abi-check | expand |
On 06/06/2023 17:59, Jonathan Wakely via Libstdc++ wrote: > Tested x86_64-linux and powerpc64le-linux. Pushed to trunk. > > -- >8 -- > > Add the recently added CXXABI_1.3.15 version. Also remove two "frozen" > versions from the latestp list, as no more symbols should be added to > those now. > > libstdc++-v3/ChangeLog: > > * testsuite/util/testsuite_abi.cc (check_version): Add > CXXABI_1.3.15 symver and make it the latestp. Remove > GLIBCXX_IEEE128_3.4.31 and GLIBCXX_LDBL_3.4.31 from latestp. > --- > libstdc++-v3/testsuite/util/testsuite_abi.cc | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc > index cea6c217433..59615dd701e 100644 > --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc > +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc > @@ -233,7 +233,7 @@ check_version(symbol& test, bool added) > known_versions.push_back("CXXABI_1.3.11"); > known_versions.push_back("CXXABI_1.3.12"); > known_versions.push_back("CXXABI_1.3.13"); > - known_versions.push_back("CXXABI_1.3.14"); > + known_versions.push_back("CXXABI_1.3.15"); Did you really want to remove CXXABI_1.3.14 here ? ChangeLog says you just add CXXABI_1.3.15.
On Wed, 7 Jun 2023 at 05:43, François Dumont wrote: > > On 06/06/2023 17:59, Jonathan Wakely via Libstdc++ wrote: > > Tested x86_64-linux and powerpc64le-linux. Pushed to trunk. > > > > -- >8 -- > > > > Add the recently added CXXABI_1.3.15 version. Also remove two "frozen" > > versions from the latestp list, as no more symbols should be added to > > those now. > > > > libstdc++-v3/ChangeLog: > > > > * testsuite/util/testsuite_abi.cc (check_version): Add > > CXXABI_1.3.15 symver and make it the latestp. Remove > > GLIBCXX_IEEE128_3.4.31 and GLIBCXX_LDBL_3.4.31 from latestp. > > --- > > libstdc++-v3/testsuite/util/testsuite_abi.cc | 7 ++----- > > 1 file changed, 2 insertions(+), 5 deletions(-) > > > > diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc > b/libstdc++-v3/testsuite/util/testsuite_abi.cc > > index cea6c217433..59615dd701e 100644 > > --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc > > +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc > > @@ -233,7 +233,7 @@ check_version(symbol& test, bool added) > > known_versions.push_back("CXXABI_1.3.11"); > > known_versions.push_back("CXXABI_1.3.12"); > > known_versions.push_back("CXXABI_1.3.13"); > > - known_versions.push_back("CXXABI_1.3.14"); > > + known_versions.push_back("CXXABI_1.3.15"); > > Did you really want to remove CXXABI_1.3.14 here ? ChangeLog says you > just add CXXABI_1.3.15. > Oops, yes! Thanks for spotting that. I'll fix it today.
On Wed, 7 Jun 2023 at 09:06, Jonathan Wakely <jwakely@redhat.com> wrote: > On Wed, 7 Jun 2023 at 05:43, François Dumont wrote: > >> >> On 06/06/2023 17:59, Jonathan Wakely via Libstdc++ wrote: >> > Tested x86_64-linux and powerpc64le-linux. Pushed to trunk. >> > >> > -- >8 -- >> > >> > Add the recently added CXXABI_1.3.15 version. Also remove two "frozen" >> > versions from the latestp list, as no more symbols should be added to >> > those now. >> > >> > libstdc++-v3/ChangeLog: >> > >> > * testsuite/util/testsuite_abi.cc (check_version): Add >> > CXXABI_1.3.15 symver and make it the latestp. Remove >> > GLIBCXX_IEEE128_3.4.31 and GLIBCXX_LDBL_3.4.31 from latestp. >> > --- >> > libstdc++-v3/testsuite/util/testsuite_abi.cc | 7 ++----- >> > 1 file changed, 2 insertions(+), 5 deletions(-) >> > >> > diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc >> b/libstdc++-v3/testsuite/util/testsuite_abi.cc >> > index cea6c217433..59615dd701e 100644 >> > --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc >> > +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc >> > @@ -233,7 +233,7 @@ check_version(symbol& test, bool added) >> > known_versions.push_back("CXXABI_1.3.11"); >> > known_versions.push_back("CXXABI_1.3.12"); >> > known_versions.push_back("CXXABI_1.3.13"); >> > - known_versions.push_back("CXXABI_1.3.14"); >> > + known_versions.push_back("CXXABI_1.3.15"); >> >> Did you really want to remove CXXABI_1.3.14 here ? ChangeLog says you >> just add CXXABI_1.3.15. >> > > Oops, yes! Thanks for spotting that. I'll fix it today. > > Fixed at r14-1613-gb6235dbcfc3143, thanks again. The abi-check test didn't fail because all symbols in the CXXABI_1.3.14 version are already in the baseline_symbols.txt file, so none of them is compared to the list of known_versions. That meant it didn't matter that CXXABI_1.3.14 wasn't in the known versions.
diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc index cea6c217433..59615dd701e 100644 --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc @@ -233,7 +233,7 @@ check_version(symbol& test, bool added) known_versions.push_back("CXXABI_1.3.11"); known_versions.push_back("CXXABI_1.3.12"); known_versions.push_back("CXXABI_1.3.13"); - known_versions.push_back("CXXABI_1.3.14"); + known_versions.push_back("CXXABI_1.3.15"); known_versions.push_back("CXXABI_IEEE128_1.3.13"); known_versions.push_back("CXXABI_TM_1"); known_versions.push_back("CXXABI_FLOAT128"); @@ -253,10 +253,7 @@ check_version(symbol& test, bool added) // Check that added symbols are added in the latest pre-release version. bool latestp = (test.version_name == "GLIBCXX_3.4.32" - // XXX remove next 2 lines when baselines have been regenerated. - || test.version_name == "GLIBCXX_IEEE128_3.4.31" - || test.version_name == "GLIBCXX_LDBL_3.4.31" - || test.version_name == "CXXABI_1.3.14" + || test.version_name == "CXXABI_1.3.15" || test.version_name == "CXXABI_FLOAT128" || test.version_name == "CXXABI_TM_1"); if (added && !latestp)