Tested x86_64-linux and powerpc64le-linux. Pushed to trunk. -- >8 --
The new symbols need to be exported, as well as some of the std::locale::facet::id globals, which are not new but were presumably not needed by any inline functions before now. libstdc++-v3/ChangeLog: PR libstdc++/108327 * config/os/gnu-linux/ldbl-extra.ver (GLIBCXX_LDBL_3.4.31): Export __try_use_facet specializations for facets in namespace __gnu_cxx_ldbl128. * config/os/gnu-linux/ldbl-ieee128-extra.ver (GLIBCXX_IEEE128_3.4.31): Likewise for facets in namespace __gnu_cxx_ieee128. * testsuite/util/testsuite_abi.cc: Add to lists of known and latest versions. --- libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver | 4 ++++ libstdc++-v3/config/os/gnu-linux/ldbl-ieee128-extra.ver | 7 +++++++ libstdc++-v3/testsuite/util/testsuite_abi.cc | 9 ++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver b/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver index 8c7c783ba58..ba7cc3308f7 100644 --- a/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver +++ b/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver @@ -45,6 +45,10 @@ GLIBCXX_LDBL_3.4.29 { _ZSt8to_charsPcS_g*; } GLIBCXX_LDBL_3.4.21; +GLIBCXX_LDBL_3.4.31 { + _ZSt15__try_use_facetINSt17__gnu_cxx_ldbl128[789]*; +} GLIBCXX_LDBL_3.4.29; + CXXABI_LDBL_1.3 { _ZT[IS]g; _ZT[IS]Pg; diff --git a/libstdc++-v3/config/os/gnu-linux/ldbl-ieee128-extra.ver b/libstdc++-v3/config/os/gnu-linux/ldbl-ieee128-extra.ver index 830cb8c40f4..17d696364c4 100644 --- a/libstdc++-v3/config/os/gnu-linux/ldbl-ieee128-extra.ver +++ b/libstdc++-v3/config/os/gnu-linux/ldbl-ieee128-extra.ver @@ -50,6 +50,13 @@ GLIBCXX_IEEE128_3.4.30 { _ZNSt17__gnu_cxx_ieee12816__convert_from_vERKP15__locale_structPciPKcz; } GLIBCXX_3.4.30; +GLIBCXX_IEEE128_3.4.31 { + _ZSt15__try_use_facetINSt17__gnu_cxx_ieee1287num_get*; + _ZSt15__try_use_facetINSt17__gnu_cxx_ieee1287num_put*; + _ZNSt19__gnu_cxx11_ieee1289money_getI[cw]St19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEE2idE; + _ZNSt19__gnu_cxx11_ieee1289money_putI[cw]St19ostreambuf_iteratorI[cw]St11char_traitsI[cw]EEE2idE; +} GLIBCXX_3.4.31; + CXXABI_IEEE128_1.3.13 { _ZT[IS]u9__ieee128; diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc index 27616f5987e..f838d27cfb5 100644 --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc @@ -210,11 +210,13 @@ check_version(symbol& test, bool added) known_versions.push_back("GLIBCXX_3.4.27"); known_versions.push_back("GLIBCXX_3.4.28"); known_versions.push_back("GLIBCXX_3.4.29"); + known_versions.push_back("GLIBCXX_LDBL_3.4.29"); known_versions.push_back("GLIBCXX_3.4.30"); known_versions.push_back("GLIBCXX_3.4.31"); - known_versions.push_back("GLIBCXX_LDBL_3.4.29"); + known_versions.push_back("GLIBCXX_LDBL_3.4.31"); known_versions.push_back("GLIBCXX_IEEE128_3.4.29"); known_versions.push_back("GLIBCXX_IEEE128_3.4.30"); + known_versions.push_back("GLIBCXX_IEEE128_3.4.31"); known_versions.push_back("CXXABI_1.3"); known_versions.push_back("CXXABI_LDBL_1.3"); known_versions.push_back("CXXABI_1.3.1"); @@ -250,8 +252,9 @@ 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.31" - // XXX remove next line when baselines have been regenerated. - || test.version_name == "GLIBCXX_IEEE128_3.4.30" + // 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_FLOAT128" || test.version_name == "CXXABI_TM_1"); -- 2.39.0