From a6e4b81b12e57b139225a47946fd540f68706a42 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 19 Apr 2023 13:12:23 +0100 Subject: [PATCH] Revert "libstdc++: Fix preprocessor condition in linker script [PR108969]" This reverts commit 6067ae4557a3a7e5b08359e78a29b8a9d5dfedce. libstdc++-v3/ChangeLog: * config/abi/pre/gnu.ver: --- libstdc++-v3/config/abi/pre/gnu.ver | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index 311a5056e724..7c015524b62b 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; -- 2.47.2