diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2016-07-29 11:42:17 +0100 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-07-29 11:42:17 +0100 |
commit | 62589e99d10e8fdc8de60fae1f0fafdcfa79daaf (patch) | |
tree | b88cc9322b3ea2c7b807433fbeb806a4724f0681 /libstdc++-v3 | |
parent | fe97ccec240a25f921b1800bdabe637b3ea21d6c (diff) | |
download | gcc-62589e99d10e8fdc8de60fae1f0fafdcfa79daaf.zip gcc-62589e99d10e8fdc8de60fae1f0fafdcfa79daaf.tar.gz gcc-62589e99d10e8fdc8de60fae1f0fafdcfa79daaf.tar.bz2 |
New libstdc++ symbol version for new basic_string symbols
* acinclude.m4 (libtool_VERSION): Bump to 6:23:0.
* config/abi/pre/gnu.ver: Add 3.4.23 version for new basic_string
symbols.
* configure: Regenerate.
* testsuite/util/testsuite_abi.cc: Add new symbol version.
From-SVN: r238853
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
-rw-r--r-- | libstdc++-v3/acinclude.m4 | 2 | ||||
-rw-r--r-- | libstdc++-v3/config/abi/pre/gnu.ver | 14 | ||||
-rwxr-xr-x | libstdc++-v3/configure | 2 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_abi.cc | 5 |
5 files changed, 24 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b3cfd2e..1bd0ebb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2016-07-29 Jonathan Wakely <jwakely@redhat.com> + * acinclude.m4 (libtool_VERSION): Bump to 6:23:0. + * config/abi/pre/gnu.ver: Add 3.4.23 version for new basic_string + symbols. + * configure: Regenerate. + * testsuite/util/testsuite_abi.cc: Add new symbol version. + * config/abi/post/i386-linux-gnu/baseline_symbols.txt: Update. * config/abi/post/i486-linux-gnu/baseline_symbols.txt: Likewise. * config/abi/post/powerpc-linux-gnu/baseline_symbols.txt: Likewise. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 0824243..aaf5adb 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -3696,7 +3696,7 @@ changequote([,])dnl fi # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=6:22:0 +libtool_VERSION=6:23:0 # Everything parsed; figure out what files and settings to use. case $enable_symvers in diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index 5c6b0fe..b7f54e2 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -1678,7 +1678,12 @@ GLIBCXX_3.4.21 { _ZNSt13__future_base13_State_baseV211_Make_ready6_M_setEv; # ABI-tagged std::basic_string - _ZNSt7__cxx1112basic_string*; + _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE1[01]**; + _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE12_Alloc_hiderC[12]EP[cw]RKS3_; + _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE12_M*; + _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE1[3-9]*; + _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE[2-9]*; + _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE[CDaip]*; _ZNKSt7__cxx1112basic_string*; # operator+ for ABI-tagged std::basic_string @@ -1909,6 +1914,13 @@ GLIBCXX_3.4.22 { } GLIBCXX_3.4.21; +GLIBCXX_3.4.23 { + + # basic_string<C, T, A>::_Alloc_hider::_Alloc_hider(C*, A&&) + _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE12_Alloc_hiderC[12]EP[cw]OS3_; + +} GLIBCXX_3.4.22; + # Symbols in the support library (libsupc++) have their own tag. CXXABI_1.3 { diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index fcbf402..f2a75aa 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -79051,7 +79051,7 @@ $as_echo "$as_me: WARNING: === Symbol versioning will be disabled." >&2;} fi # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=6:22:0 +libtool_VERSION=6:23:0 # Everything parsed; figure out what files and settings to use. case $enable_symvers in diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc index caf1544..9001345 100644 --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc @@ -201,8 +201,9 @@ check_version(symbol& test, bool added) known_versions.push_back("GLIBCXX_3.4.19"); known_versions.push_back("GLIBCXX_3.4.20"); known_versions.push_back("GLIBCXX_3.4.21"); - known_versions.push_back("GLIBCXX_3.4.22"); known_versions.push_back("GLIBCXX_LDBL_3.4.21"); + known_versions.push_back("GLIBCXX_3.4.22"); + known_versions.push_back("GLIBCXX_3.4.23"); known_versions.push_back("CXXABI_1.3"); known_versions.push_back("CXXABI_LDBL_1.3"); known_versions.push_back("CXXABI_1.3.1"); @@ -232,7 +233,7 @@ check_version(symbol& test, bool added) test.version_status = symbol::incompatible; // Check that added symbols are added in the latest pre-release version. - bool latestp = (test.version_name == "GLIBCXX_3.4.22" + bool latestp = (test.version_name == "GLIBCXX_3.4.23" || test.version_name == "CXXABI_1.3.10" || test.version_name == "CXXABI_FLOAT128" || test.version_name == "CXXABI_TM_1"); |