From ffe6b4101501b5ada6f09a1fdf3822a23b68b5aa Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 29 Oct 2020 22:47:22 +0000 Subject: [PATCH] libstdc++: Fix linker script to remove conflicting patterns This should fix a bootstrap error on Solaris, due to some of the new symbols matching old patterns as well as new ones. libstdc++-v3/ChangeLog: * config/abi/pre/gnu.ver (GLIBCXX_3.4.21): Tighten patterns for old symbols some more. --- libstdc++-v3/config/abi/pre/gnu.ver | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index 80994b203df..4dddfd3d263 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -1791,11 +1791,11 @@ GLIBCXX_3.4.21 { _ZNSt7__cxx1119basic_[io]stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EEC[12]ESt13_Ios_Openmode; _ZNSt7__cxx1119basic_[io]stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EED[012]Ev; _ZNSt7__cxx1119basic_[io]stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EE[a34]*; - _ZNKSt7__cxx1115basic_stringbuf*; + _ZNKSt7__cxx1115basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE3strEv; _ZNKSt7__cxx1118basic_stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EE3strEv; _ZNKSt7__cxx1118basic_stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EE5rdbufEv; - _ZNKSt7__cxx1119basic_istringstream*; - _ZNKSt7__cxx1119basic_ostringstream*; + _ZNKSt7__cxx1119basic_[io]stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EE3strEv; + _ZNKSt7__cxx1119basic_[io]stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EE5rdbufEv; _ZT[ISTV]NSt7__cxx1115basic_stringbuf*; _ZT[ISTV]NSt7__cxx1118basic_stringstream*; _ZT[ISTV]NSt7__cxx1119basic_istringstream*; -- 2.30.2