* config/abi/pre/gnu.ver: Move decltype(nullptr) into CXXABI_1.3.5.

	* testsuite/util/testsuite_abi.cc (check_version): Add CXXABI_1.3.5.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159136 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fe4b74aff560dc36ad115f2f932122a97aac4afd..652e58915385778a1b8b2d0d78dcc4fa17a464c4 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-06  Jason Merrill  <jason@redhat.com>
 
+       * config/abi/pre/gnu.ver: Move decltype(nullptr) into CXXABI_1.3.5.
+       * testsuite/util/testsuite_abi.cc (check_version): Add CXXABI_1.3.5.
+
        * config/abi/pre/gnu.ver: Add typeinfo for decltype(nullptr).
 
 2010-05-06  Jonathan Wakely  <jwakely.gcc@gmail.com>

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 3552d59373544612c0e283e24705d87a6bd406ee..998b651d8018401c5b78192fce698b89a035bd1e 100644 (file)
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -1307,9 +1307,18 @@ CXXABI_1.3.3 {
 
 CXXABI_1.3.4 {
 
-    # typeinfo for decimal floating point types and decltype(nullptr)
-    _ZTID[fden];
-    _ZTIPD[fden];
-    _ZTIPKD[fden];
+    # typeinfo for decimal floating point types
+    _ZTID[fde];
+    _ZTIPD[fde];
+    _ZTIPKD[fde];
 
 } CXXABI_1.3.3;
+
+CXXABI_1.3.5 {
+
+    # typeinfo for decltype(nullptr)
+    _ZTIDn;
+    _ZTIPDn;
+    _ZTIPKDn;
+
+} CXXABI_1.3.4;

diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc
index 2c9f93055faf2e27ba8a36ceaed2e7d7df280826..c7166c69917c86fd5f7c4ef095904b419a9a221e 100644 (file)
--- a/libstdc++-v3/testsuite/util/testsuite_abi.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc
@@ -194,6 +194,7 @@ check_version(symbol& test, bool added)
       known_versions.push_back("CXXABI_1.3.2");
       known_versions.push_back("CXXABI_1.3.3");
       known_versions.push_back("CXXABI_1.3.4");
+      known_versions.push_back("CXXABI_1.3.5");
       known_versions.push_back("CXXABI_LDBL_1.3");
     }
   compat_list::iterator begin = known_versions.begin();