From f1b3168d7f2bec7f349ec9c27f0bb5a7e2e5b543 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 6 Jul 2018 13:52:41 +0100 Subject: [PATCH] Simplify linker script patterns for std::exception_ptr * config/abi/pre/gnu.ver: Use wildcards to combine related patterns. From-SVN: r262475 --- libstdc++-v3/ChangeLog | 2 ++ libstdc++-v3/config/abi/pre/gnu.ver | 12 ++++-------- 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 + * 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; -- 2.30.2