... oops, no need to open a new minor version, we already bumped post 4.6.0.
Committed mainline and 4_6-branch.
Paolo.
//////////////////////
2011-05-25 Paolo Carlini <paolo.carl...@oracle.com>
* config/abi/pre/gnu.ver: Correct last change, export instead
at the existing @3.4.16.
* configure.ac: Revert last change.
* testsuite/util/testsuite_abi.cc: Likewise.
* configure: Regenerate.
Index: configure.ac
===================================================================
--- configure.ac (revision 174242)
+++ configure.ac (working copy)
@@ -12,7 +12,7 @@
### am handles this now? ORIGINAL_LD_FOR_MULTILIBS=$LD
# For libtool versioning info, format is CURRENT:REVISION:AGE
-libtool_VERSION=6:17:0
+libtool_VERSION=6:16:0
AC_SUBST(libtool_VERSION)
# Find the rest of the source tree framework.
Index: testsuite/util/testsuite_abi.cc
===================================================================
--- testsuite/util/testsuite_abi.cc (revision 174242)
+++ testsuite/util/testsuite_abi.cc (working copy)
@@ -194,7 +194,6 @@
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_3.4.17");
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");
Index: config/abi/pre/gnu.ver
===================================================================
--- config/abi/pre/gnu.ver (revision 174242)
+++ config/abi/pre/gnu.ver (working copy)
@@ -1270,10 +1270,6 @@
_ZNSs10_S_compareE[jmy][jmy];
_ZNSbIwSt11char_traitsIwESaIwEE10_S_compareE[jmy][jmy];
-} GLIBCXX_3.4.15;
-
-GLIBCXX_3.4.17 {
-
# basic_streambuf<>::__safe_gbump, __safe_pbump
_ZNSt15basic_streambufI[cw]St11char_traitsI[cw]EE12__safe_gbumpE*;
_ZNSt15basic_streambufI[cw]St11char_traitsI[cw]EE12__safe_pbumpE*;
@@ -1281,7 +1277,7 @@
# basic_stringbuf<>::_M_pbump
_ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE8_M_pbumpE*;
-} GLIBCXX_3.4.16;
+} GLIBCXX_3.4.15;
# Symbols in the support library (libsupc++) have their own tag.
CXXABI_1.3 {
