diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-04-18 17:22:40 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-04-18 17:29:14 +0100 |
| commit | ed933888e680384e1e7af361b20dd484ad424f7d (patch) | |
| tree | 850c29692811da73a61bf7face08b1a44c04d45c | |
| parent | 762be0646bf96761ce68a9e06ab60c453e0963d0 (diff) | |
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)
| -rw-r--r-- | libstdc++-v3/config/abi/pre/gnu.ver | 5 |
1 files 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; |