diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-01-11 10:25:46 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-01-11 10:25:46 +0000 |
| commit | 8ce7e3f8e9789d9185da6d18c8b31b70185de6dc (patch) | |
| tree | ccca0e081f7542b555dc4ae4092670e99f5c3436 | |
| parent | 6ebf16e63f00d96e5740ac4de9f5251d9cb2f50e (diff) | |
| download | gcc-8ce7e3f8e9789d9185da6d18c8b31b70185de6dc.zip gcc-8ce7e3f8e9789d9185da6d18c8b31b70185de6dc.tar.gz gcc-8ce7e3f8e9789d9185da6d18c8b31b70185de6dc.tar.bz2 | |
Fix incorrect linker script patterns
The recent changes to support operator<<(nullptr_t) changed the glob
patterns for existing operator<<(T) overloads, but did so incorrectly so
they still matched the new symbols. That broke Solaris bootstrap. This
patch replaces each of the existing globs by two more precise ones,
which match the old symbols but not the new ones.
* config/abi/pre/gnu.ver (GLIBCXX_3.4): Correct recent changes to
basic_ostream::operator<< patterns.
From-SVN: r267832
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/config/abi/pre/gnu.ver | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index edbc2ec..0ee7079 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2019-01-11 Jonathan Wakely <jwakely@redhat.com> + + * config/abi/pre/gnu.ver (GLIBCXX_3.4): Correct recent changes to + basic_ostream::operator<< patterns. + 2019-01-10 Jonathan Wakely <jwakely@redhat.com> * testsuite/27_io/filesystem/operations/last_write_time.cc: Fix diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index 788c2e0..d3431d2 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -495,7 +495,8 @@ GLIBCXX_3.4 { _ZNSo8_M_writeEPKc[ilx]; _ZNSo3put*; _ZNSo[5-9][a-z]*; - _ZNSolsE*[^Dg]; + _ZNSolsE[^g]; + _ZNSolsEP*; # std::basic_ostream<wchar_t> _ZNSt13basic_ostreamIwSt11char_traitsIwEEC[12]Ev; @@ -509,7 +510,8 @@ GLIBCXX_3.4 { _ZNSt13basic_ostreamIwSt11char_traitsIwEE5writeEPKw*; _ZNSt13basic_ostreamIwSt11char_traitsIwEE6sentry*; _ZNSt13basic_ostreamIwSt11char_traitsIwEE8_M_writeEPKw[ilx]; - _ZNSt13basic_ostreamIwSt11char_traitsIwEElsE*[^Dg]; + _ZNSt13basic_ostreamIwSt11char_traitsIwEElsE[^g]; + _ZNSt13basic_ostreamIwSt11char_traitsIwEElsEP*; # std::ostream operators and inserters _ZSt4end[ls]I[cw]St11char_traitsI[cw]EERSt13basic_ostream*; |