From 06bbb71a2b6d940abd0f45989f2b4ba06ee1fa4a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 26 Apr 2019 17:44:12 +0100 Subject: [PATCH] Adjust linker script to stop exporting unwanted symbol in old version As discussed in the thread starting at https://gcc.gnu.org/ml/libstdc++/2019-04/msg00140.html * config/abi/pre/gnu.ver (GLIBCXX_3.4): Replace wildcard that matches wstring::_M_replace_dispatch with more specific patterns. From-SVN: r270611 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/config/abi/pre/gnu.ver | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 604f1d5b8faa..ef948bccc4fb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2019-04-26 Jonathan Wakely + + * config/abi/pre/gnu.ver (GLIBCXX_3.4): Replace wildcard that matches + wstring::_M_replace_dispatch with more specific patterns. + 2019-04-26 Jakub Jelinek * config/abi/post/s390x-linux-gnu/32/baseline_symbols.txt: Update. diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index e8cf6f0a4a9d..7eff4e983f3f 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -299,7 +299,8 @@ GLIBCXX_3.4 { _ZNSbIwSt11char_traitsIwESaIwEE12_S_constructE[jmy]wRKS1_; _ZNSbIwSt11char_traitsIwESaIwEE12_S_empty_repEv; _ZNSbIwSt11char_traitsIwESaIwEE13_S_copy_chars*; - _ZNSbIwSt11char_traitsIwESaIwEE[0-9][0-9]_M_replace*; + _ZNSbIwSt11char_traitsIwESaIwEE14_M_replace_aux*; + _ZNSbIwSt11char_traitsIwESaIwEE15_M_replace_safe*; _ZNSbIwSt11char_traitsIwESaIwEE4_Rep10_M_destroy*; _ZNSbIwSt11char_traitsIwESaIwEE4_Rep10_M_dispose*; _ZNSbIwSt11char_traitsIwESaIwEE4_Rep10_M_refcopyEv; -- 2.47.2