aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/config/abi/pre/gnu.ver3
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 53c3160..e8a621a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-17 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ PR bootstrap/50715
+ * config/abi/pre/gnu.ver (CXXABI_1.3.6): Remove duplicate
+ __cxa_get_exception_ptr.
+
2011-10-14 François Dumont <francois.cppdevs@free.fr>
* testsuite/performance/23_containers/insert_erase/41975.cc: New.
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index c45b7db..bb5ff9a 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -1496,7 +1496,6 @@ CXXABI_1.3.6 {
__cxa_allocate_dependent_exception;
__cxa_free_dependent_exception;
- __cxa_get_exception_ptr;
__cxa_deleted_virtual;
-} CXXABI_1.3.5; \ No newline at end of file
+} CXXABI_1.3.5;