From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id B72E73858D1E; Sat, 5 Mar 2022 20:34:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B72E73858D1E 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 r12-7504] libstdc++: Ensure __glibcxx_assert_fail has default visibility X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: dab41c9d9fabe86bdc65d97ba1c1e898488d4810 X-Git-Newrev: d3a757af21ac330d438aaf5f97fa47d2efed11ea Message-Id: <20220305203419.B72E73858D1E@sourceware.org> Date: Sat, 5 Mar 2022 20:34:19 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Mar 2022 20:34:19 -0000 https://gcc.gnu.org/g:d3a757af21ac330d438aaf5f97fa47d2efed11ea commit r12-7504-gd3a757af21ac330d438aaf5f97fa47d2efed11ea Author: Jonathan Wakely Date: Fri Mar 4 18:23:10 2022 +0000 libstdc++: Ensure __glibcxx_assert_fail has default visibility This ensures there's no linker error if libstdc++ headers are included following a pragma that sets hidden visibility. Similarly for std::__terminate, which is always-inline so shouldn't matter, but it's not wrong to do this anyway. libstdc++-v3/ChangeLog: * include/bits/c++config (__glibcxx_assert_fail): Add visibility attribute. (__terminate): Likewise. Diff: --- libstdc++-v3/include/bits/c++config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index c64b61b3c90..6c134f13509 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -305,6 +305,7 @@ namespace std // This allows the library to terminate without including all of // and without making the declaration of std::terminate visible to users. extern "C++" __attribute__ ((__noreturn__, __always_inline__)) + _GLIBCXX_VISIBILITY(default) inline void __terminate() _GLIBCXX_USE_NOEXCEPT { void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__)); @@ -554,7 +555,7 @@ namespace std { // Avoid the use of assert, because we're trying to keep the // include out of the mix. - extern "C++" _GLIBCXX_NORETURN + extern "C++" _GLIBCXX_NORETURN _GLIBCXX_VISIBILITY(default) void __glibcxx_assert_fail(const char* __file, int __line, const char* __function, const char* __condition)