aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2025-03-31 17:07:55 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2025-03-31 18:24:30 +0100
commit44289d258a970e39059afa33d2a44d16ba41d3f2 (patch)
tree4aebb6517667656b1c07fc255fe452f1a08fd31c
parent9fadadbbbc2b5352e5e70e0e1a9be9b447176913 (diff)
downloadgcc-44289d258a970e39059afa33d2a44d16ba41d3f2.zip
gcc-44289d258a970e39059afa33d2a44d16ba41d3f2.tar.gz
gcc-44289d258a970e39059afa33d2a44d16ba41d3f2.tar.bz2
libstdc++: Tweak linker script to avoid conflict on Solaris
The new symbols for the _M_construct<bool> function template match an existing pattern in the GLIBCXX_3.4.21 version, as well as the intended pattern in the GLIBCXX_3.4.34 version. That causes a linker error on Solaris. libstdc++-v3/ChangeLog: * config/abi/pre/gnu.ver (GLIBCXX_3.4.21): Make std::basic_string::_M_construct patterns more precise.
-rw-r--r--libstdc++-v3/config/abi/pre/gnu.ver3
1 files changed, 2 insertions, 1 deletions
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 10bf997..29bc7d8 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -1767,7 +1767,8 @@ GLIBCXX_3.4.21 {
_ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE10_S_compareE[jmy][jmy];
_ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE11_M_capacityE[jmy];
_ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE12_Alloc_hiderC[12]EP[cw]RKS3_;
- _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE12_M*;
+ _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE12_M_constructE[jmy][cw];
+ _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE12_M_constructI[NP]*;
_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[68-9]*;