From 07703a378555c1bd8a95af39e345fc557a6fdc9b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sun, 10 Apr 2011 16:20:42 +0000 Subject: [PATCH] re PR libstdc++/48465 (undefined reference to std::basic_string::_S_compare(unsigned long, unsigned long)) 2011-04-10 Jonathan Wakely PR libstdc++/48465 * configure.ac (libtool_VERSION): Bump library version to 6:16:0. * configure: Regenerate. * config/abi/pre/gnu.ver (GLIBCXX_3.4.16): Export missing symbols. * testsuite/util/testsuite_abi.cc: Add GLIBCXX_3.4.16. From-SVN: r172241 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/config/abi/pre/gnu.ver | 8 ++++++++ libstdc++-v3/configure | 2 +- libstdc++-v3/configure.ac | 2 +- libstdc++-v3/testsuite/util/testsuite_abi.cc | 1 + 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cb122353965..86ae32ce9aa 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2011-04-10 Jonathan Wakely + + PR libstdc++/48465 + * configure.ac (libtool_VERSION): Bump library version to 6:16:0. + * configure: Regenerate. + * config/abi/pre/gnu.ver (GLIBCXX_3.4.16): Export missing symbols. + * testsuite/util/testsuite_abi.cc: Add GLIBCXX_3.4.16. + 2011-04-06 Jeffrey Yasskin * include/ext/algorithm (is_sorted): In C++0x mode import from diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index fa5267248ee..839f84669de 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -1264,6 +1264,14 @@ GLIBCXX_3.4.15 { } GLIBCXX_3.4.14; +GLIBCXX_3.4.16 { + + # libstdc++/48465 + _ZNSs10_S_compareE[jmy][jmy]; + _ZNSbIwSt11char_traitsIwESaIwEE10_S_compareE[jmy][jmy]; + +} GLIBCXX_3.4.15; + # Symbols in the support library (libsupc++) have their own tag. CXXABI_1.3 { diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index fa6a1a5ccf7..c3cd3a68f81 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -2825,7 +2825,7 @@ ac_config_headers="$ac_config_headers config.h" ### am handles this now? ORIGINAL_LD_FOR_MULTILIBS=$LD # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=6:15:0 +libtool_VERSION=6:16:0 # Find the rest of the source tree framework. diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index 1a1964e0ff1..35c54fd4e9a 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -12,7 +12,7 @@ AC_CONFIG_HEADER(config.h) ### am handles this now? ORIGINAL_LD_FOR_MULTILIBS=$LD # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=6:15:0 +libtool_VERSION=6:16:0 AC_SUBST(libtool_VERSION) # Find the rest of the source tree framework. diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc index a533311bb73..ea100b6817f 100644 --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc @@ -193,6 +193,7 @@ check_version(symbol& test, bool added) known_versions.push_back("GLIBCXX_3.4.13"); known_versions.push_back("GLIBCXX_3.4.14"); known_versions.push_back("GLIBCXX_3.4.15"); + known_versions.push_back("GLIBCXX_3.4.16"); known_versions.push_back("GLIBCXX_LDBL_3.4"); known_versions.push_back("GLIBCXX_LDBL_3.4.7"); known_versions.push_back("GLIBCXX_LDBL_3.4.10"); -- 2.30.2