aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2018-07-06 12:52:41 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2018-07-06 12:52:41 +0000
commit669d54f7dd1314ace892fc874c272aa3c69dc82d (patch)
treeaa26f3d6ca7452e3579aa761dc5cb93bcacb4719
parent8cffd3e3df4a69161c4b58d6074973f2d55f16db (diff)
Simplify linker script patterns for std::exception_ptr
* config/abi/pre/gnu.ver: Use wildcards to combine related patterns. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@262475 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog2
-rw-r--r--libstdc++-v3/config/abi/pre/gnu.ver12
2 files changed, 6 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 733c831aa6a..8519bea7213 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,7 @@
2018-07-06 Jonathan Wakely <jwakely@redhat.com>
+ * config/abi/pre/gnu.ver: Use wildcards to combine related patterns.
+
P0935R0 Eradicating unnecessarily explicit default constructors
* config/abi/pre/gnu.ver: Tighten existing patterns and export new
default constructor symbols.
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index e634d3ab707..b09bdef6d09 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -2174,14 +2174,10 @@ CXXABI_1.3.3 {
#ifdef HAVE_EXCEPTION_PTR_SINCE_GCC46
# exception_ptr
- _ZNSt15__exception_ptr13exception_ptrC1Ev;
- _ZNSt15__exception_ptr13exception_ptrC2Ev;
- _ZNSt15__exception_ptr13exception_ptrC1ERKS0_;
- _ZNSt15__exception_ptr13exception_ptrC2ERKS0_;
- _ZNSt15__exception_ptr13exception_ptrC1EMS0_FvvE;
- _ZNSt15__exception_ptr13exception_ptrC2EMS0_FvvE;
- _ZNSt15__exception_ptr13exception_ptrD1Ev;
- _ZNSt15__exception_ptr13exception_ptrD2Ev;
+ _ZNSt15__exception_ptr13exception_ptrC[12]Ev;
+ _ZNSt15__exception_ptr13exception_ptrC[12]ERKS0_;
+ _ZNSt15__exception_ptr13exception_ptrC[12]EMS0_FvvE;
+ _ZNSt15__exception_ptr13exception_ptrD[12]Ev;
_ZNSt15__exception_ptr13exception_ptraSERKS0_;
_ZNKSt15__exception_ptr13exception_ptrcvMS0_FvvEEv;
_ZNKSt15__exception_ptr13exception_ptrntEv;