yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libstdc++: Fix preprocessor condition in linker script [PR108969]

Browse Source 
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)
This commit is contained in:
Jonathan Wakely
2023-04-18 17:22:40 +01:00
parent 762be0646b
commit ed933888e6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libstdc++-v3/config/abi/pre/gnu.ver
+2 -3
View File
@@ -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;