]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Revert "libstdc++: Fix preprocessor condition in linker script [PR108969]"
authorJonathan Wakely <jwakely@redhat.com>
Wed, 19 Apr 2023 12:12:23 +0000 (13:12 +0100)
committerJonathan Wakely <jwakely@redhat.com>
Wed, 19 Apr 2023 12:18:12 +0000 (13:18 +0100)
This reverts commit 6067ae4557a3a7e5b08359e78a29b8a9d5dfedce.

libstdc++-v3/ChangeLog:

* config/abi/pre/gnu.ver:

libstdc++-v3/config/abi/pre/gnu.ver

index 311a5056e7248f3ed43738ef768422b95d1206b3..7c015524b62b7b8a8d08cc0ef08fae8ee654b580 100644 (file)
@@ -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;