[gcc r13-7225] Revert "libstdc++: Fix preprocessor condition in linker script [PR108969]"

Jonathan Wakely redi@gcc.gnu.org
Wed Apr 19 12:20:10 GMT 2023


https://gcc.gnu.org/g:f226c8181e5175bc089dfd07df86e6c72ec883af

commit r13-7225-gf226c8181e5175bc089dfd07df86e6c72ec883af
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Apr 19 13:18:53 2023 +0100

    Revert "libstdc++: Fix preprocessor condition in linker script [PR108969]"
    
    This reverts commit ed933888e680384e1e7af361b20dd484ad424f7d.

Diff:
---
 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 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;


More information about the Libstdc++-cvs mailing list