From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 9719A3858438; Tue, 18 Apr 2023 16:31:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9719A3858438 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681835466; bh=3og1O1AdM9kfVaTYGDmfzKlr2MG290oE1WYZW/Hldqw=; h=From:To:Subject:Date:From; b=BzDryta5helnu++9+yaeeZHzNpB9dZz50AywqhLLpFG5v9ZfjkBarp3b9m3nueyj4 vcNGTUoMuzwRcDa/Dewax5I3TEVSCV4e2yykyAH9UnqWPpk/HA5O97uVdQ7Mez8hvK QgHNr0FHeY933T5QtSI8cwCoGN0JCql/tOJ7dCic= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-7218] libstdc++: Fix preprocessor condition in linker script [PR108969] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 762be0646bf96761ce68a9e06ab60c453e0963d0 X-Git-Newrev: ed933888e680384e1e7af361b20dd484ad424f7d Message-Id: <20230418163106.9719A3858438@sourceware.org> Date: Tue, 18 Apr 2023 16:31:06 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ed933888e680384e1e7af361b20dd484ad424f7d commit r13-7218-ged933888e680384e1e7af361b20dd484ad424f7d Author: Jonathan Wakely 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;