From e93bfd2de58609270d56730eeae9d31ec994aeba Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Tue, 8 Jan 2019 12:04:38 +0000 Subject: [PATCH] Fix libstdc++.so link on Solaris with C++17 std::basic_string member functions * config/abi/pre/gnu.ver (GLIBCXX_3.4): Tighten existing patterns. (GLIBCXX_3.4.21): Likewise. From-SVN: r267723 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/config/abi/pre/gnu.ver | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f3853f26bac..84fb8d7d045 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2019-01-08 Rainer Orth + + * config/abi/pre/gnu.ver (GLIBCXX_3.4): Tighten existing patterns. + (GLIBCXX_3.4.21): Likewise. + 2019-01-08 Jonathan Wakely PR libstdc++/88749 diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index 02a6ec90375..92af1aec7b4 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -217,7 +217,7 @@ GLIBCXX_3.4 { _ZNSsD*; _ZNSs[0-58-9]a*; _ZNSs5beginEv; - _ZNSs[0-58-9][c-e]*; + _ZNSs[0-358-9][c-e]*; _ZNSs[0-59][g-z]*; # _ZNSs[67][a-z]*E[PRcjmvy]*; _ZNSs6appendE[PRcjmvy]*; @@ -258,7 +258,7 @@ GLIBCXX_3.4 { _ZNKSs[0-9][g-z]*; _ZNKSs[0-9][0-9][a-z]*; _ZNKSs4find*; - _ZNKSs[a-z]*; + _ZNKSs[abd-z]*; _ZNKSs4_Rep12_M_is_leakedEv; _ZNKSs4_Rep12_M_is_sharedEv; _ZNKSs6_M_repEv; @@ -284,7 +284,7 @@ GLIBCXX_3.4 { _ZNSbIwSt11char_traitsIwESaIwEED*; _ZNSbIwSt11char_traitsIwESaIwEE[0-58-9]a*; _ZNSbIwSt11char_traitsIwESaIwEE5beginEv; - _ZNSbIwSt11char_traitsIwESaIwEE[0-58-9][c-e]*; + _ZNSbIwSt11char_traitsIwESaIwEE[0-358-9][c-e]*; _ZNSbIwSt11char_traitsIwESaIwEE[0-59][g-z]*; # _ZNSbIwSt11char_traitsIwESaIwEE[67][a-b]*E[PRwjmvy]*; _ZNSbIwSt11char_traitsIwESaIwEE6appendE[PRwjmvy]*; @@ -324,7 +324,7 @@ GLIBCXX_3.4 { _ZNKSbIwSt11char_traitsIwESaIwEE[0-9][d-e]*; _ZNKSbIwSt11char_traitsIwESaIwEE[0-9][g-z]*; _ZNKSbIwSt11char_traitsIwESaIwEE[0-9][0-9][a-z]*; - _ZNKSbIwSt11char_traitsIwESaIwEE[a-z]*; + _ZNKSbIwSt11char_traitsIwESaIwEE[abd-z]*; _ZNKSbIwSt11char_traitsIwESaIwEE4find*; _ZNKSbIwSt11char_traitsIwESaIwEE4_Rep12_M_is_leakedEv; _ZNKSbIwSt11char_traitsIwESaIwEE4_Rep12_M_is_sharedEv; @@ -1717,7 +1717,7 @@ GLIBCXX_3.4.21 { _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE12_M*; _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE13*; _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE14_M_replace_aux*; - _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE1[5-9]*; + _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE1[568-9]*; _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE2at*; _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE3end*; _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE4back*; -- 2.30.2