[committed] libstdc++: Ensure __glibcxx_assert_fail has default visibility

Jonathan Wakely jwakely@redhat.com
Sat Mar 5 20:34:33 GMT 2022

Tested powerpc64le-linux, pushed to trunk.

-- >8 --

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.


	* include/bits/c++config (__glibcxx_assert_fail): Add visibility
	(__terminate): Likewise.
 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 <exception>
   // and without making the declaration of std::terminate visible to users.
   extern "C++" __attribute__ ((__noreturn__, __always_inline__))
   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 <cassert>
   // include out of the mix.
-  extern "C++" _GLIBCXX_NORETURN
   __glibcxx_assert_fail(const char* __file, int __line,
 			const char* __function, const char* __condition)

More information about the Libstdc++ mailing list