aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2023-04-19 13:12:23 +0100
committerJonathan Wakely <jwakely@redhat.com>2023-04-19 13:18:12 +0100
commita6e4b81b12e57b139225a47946fd540f68706a42 (patch)
treece5860fc99ce668f13b681048d2d47a5cf23137a
parent6702fdcdf8b8c8ed27954972bb10b2464f4912fb (diff)
downloadgcc-a6e4b81b12e57b139225a47946fd540f68706a42.zip
gcc-a6e4b81b12e57b139225a47946fd540f68706a42.tar.gz
gcc-a6e4b81b12e57b139225a47946fd540f68706a42.tar.bz2
Revert "libstdc++: Fix preprocessor condition in linker script [PR108969]"
This reverts commit 6067ae4557a3a7e5b08359e78a29b8a9d5dfedce. libstdc++-v3/ChangeLog: * config/abi/pre/gnu.ver:
-rw-r--r--libstdc++-v3/config/abi/pre/gnu.ver5
1 files changed, 3 insertions, 2 deletions
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 311a505..7c01552 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -2512,8 +2512,9 @@ GLIBCXX_3.4.31 {
_ZNKSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE[012]EEcvbEv;
_ZNKSt12__shared_ptrINSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE[012]EEcvbEv;
-#if defined(HAVE_AS_SYMVER_DIRECTIVE) \
- && defined(HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
+#if defined(_GLIBCXX_SYMVER_GNU) && defined(_GLIBCXX_SHARED) \
+ && defined(_GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE) \
+ && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
# See src/c++98/globals_io.cc
_ZSt3cin;
_ZSt4cout;