gnu.ver: Correct last change, export instead at the existing @3.4.16.

2011-05-25  Paolo Carlini  <paolo.carlini@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.

From-SVN: r174246

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8d26ff45bf2e8a2f0bb4ae9cc2f24e7fa5d5b897..5b61f06aa2d70614957edea44a3935c02f73e6ac 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-25  Paolo Carlini  <paolo.carlini@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.
+
 2011-05-26  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
        * doc/xml/manual/documentation_hacking.xml: Minor corrections.

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 778b8261fb3633a00aa1bd701d1c09713ae66891..57744a410e58efa9d336aaf49aac19e1be2569a8 100644 (file)
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -1270,10 +1270,6 @@ GLIBCXX_3.4.16 {
     _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 @@ GLIBCXX_3.4.17 {
     # 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 {

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 244b2861f409333e2da6900dc308051800da6fe6..c3cd3a68f81306f2b49c91eab6fb2274492fe66a 100755 (executable)
--- 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:17: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 872acc09b108e6ababa7e4c50d6388ecf193095f..35c54fd4e9aacfa160caaff5ea71c1ac9b7c7c28 100644 (file)
--- 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:17: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 f1f5ad6634733b83f0d4ef20d229f3c8ace6e66f..ea100b6817fb1b4740bfdb253b12cadbacbd7330 100644 (file)
--- a/libstdc++-v3/testsuite/util/testsuite_abi.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc
@@ -194,7 +194,6 @@ check_version(symbol& test, bool added)
       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");