aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/config/abi/pre/gnu.ver17
-rw-r--r--libstdc++-v3/testsuite/util/testsuite_abi.cc1
3 files changed, 17 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fe4b74a..652e589 100644
--- 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 3552d59..998b651 100644
--- 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 2c9f930..c7166c6 100644
--- 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();