diff options
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 2 | ||||
| -rw-r--r-- | libstdc++-v3/config/abi/pre/gnu.ver | 4 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/iostream | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++98/ios_init.cc | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_abi.cc | 3 |
6 files changed, 15 insertions, 3 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 5136c0571e8..89e7f5f5f45 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -3841,7 +3841,7 @@ changequote([,])dnl fi # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=6:31:0 +libtool_VERSION=6:32: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 4ae63094eb7..36bb87880d7 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -2514,6 +2514,10 @@ GLIBCXX_3.4.31 { } GLIBCXX_3.4.30; +GLIBCXX_3.4.32 { + _ZSt21ios_base_library_initv; +} GLIBCXX_3.4.31; + # Symbols in the support library (libsupc++) have their own tag. CXXABI_1.3 { diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 68ee94c9e28..99f4927aa8c 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -68652,7 +68652,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:31:0 +libtool_VERSION=6:32:0 # Everything parsed; figure out what files and settings to use. case $enable_symvers in diff --git a/libstdc++-v3/include/std/iostream b/libstdc++-v3/include/std/iostream index 76530029b86..cfd124dcf43 100644 --- a/libstdc++-v3/include/std/iostream +++ b/libstdc++-v3/include/std/iostream @@ -77,6 +77,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // in the compiled library instead (src/c++98/globals_io.cc). #if !__has_attribute(__init_priority__) static ios_base::Init __ioinit; +#elif defined(_GLIBCXX_SYMVER_GNU) + __extension__ __asm (".globl _ZSt21ios_base_library_initv"); #endif _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/src/c++98/ios_init.cc b/libstdc++-v3/src/c++98/ios_init.cc index 6b43a6bf563..0c2ba945f36 100644 --- a/libstdc++-v3/src/c++98/ios_init.cc +++ b/libstdc++-v3/src/c++98/ios_init.cc @@ -199,5 +199,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __ret; } +#ifdef _GLIBCXX_SYMVER_GNU + void ios_base_library_init (void) + __attribute__((alias ("_ZNSt8ios_base4InitC1Ev"))); +#endif + _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc index 5b7d0435110..cea6c217433 100644 --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc @@ -213,6 +213,7 @@ check_version(symbol& test, bool added) 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_3.4.32"); 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"); @@ -251,7 +252,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.31" + 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" |