aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2023-04-19 13:18:53 +0100
committerJonathan Wakely <jwakely@redhat.com>2023-04-19 13:18:53 +0100
commitf226c8181e5175bc089dfd07df86e6c72ec883af (patch)
treeafc29ef864a792ab93bf547255503f63f0d7c861
parent865d712a9a20eed444ce61a0a0106534479bedf1 (diff)
Revert "libstdc++: Fix preprocessor condition in linker script [PR108969]"
This reverts commit ed933888e680384e1e7af361b20dd484ad424f7d.
-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 311a5056e72..7c015524b62 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;