[gcc r13-7218] libstdc++: Fix preprocessor condition in linker script [PR108969]

[gcc r13-7218] libstdc++: Fix preprocessor condition in linker script [PR108969]

[Jonathan Wakely]

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

commit r13-7218-ged933888e680384e1e7af361b20dd484ad424f7d
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Apr 18 17:22:40 2023 +0100

    libstdc++: Fix preprocessor condition in linker script [PR108969]
    
    The linker script is preprocessed with $(top_builddir)/config.h not the
    include/$target/bits/c++config.h version, which means that configure
    macros do not have the _GLIBCXX_ prefix yet.
    
    The _GLIBCXX_SYMVER_GNU and _GLIBCXX_SHARED checks are redundant,
    because the gnu.ver file is only used for _GLIBCXX_SYMVER_GNU and the
    linker script is only used for the shared library. Remove those.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/108969
            * config/abi/pre/gnu.ver: Fix preprocessor condition.
    
    (cherry picked from commit 6067ae4557a3a7e5b08359e78a29b8a9d5dfedce)

Diff:
---
 libstdc++-v3/config/abi/pre/gnu.ver | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 7c015524b62..311a5056e72 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -2512,9 +2512,8 @@ 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(_GLIBCXX_SYMVER_GNU) && defined(_GLIBCXX_SHARED) \
-    && defined(_GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE) \
-    && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
+#if defined(HAVE_AS_SYMVER_DIRECTIVE) \
+    && defined(HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
     # See src/c++98/globals_io.cc
     _ZSt3cin;
     _ZSt4cout;