From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 13 Oct 2021 09:35:44 +0000 (+0100)
Subject: libstdc++: Ensure language linkage of std::__terminate()
X-Git-Tag: basepoints/gcc-13~3946
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1b6c360fcf3fc1c0045c7358d61a83c91b6fa25;p=thirdparty%2Fgcc.git

libstdc++: Ensure language linkage of std::__terminate()

This is needed because people still find it necessary to do:

  extern "C" {
  #include <stdlib.h>
  }

libstdc++-v3/ChangeLog:

	* include/bits/c++config (__terminate): Add extern "C++".
---

diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index b76ffeb25621..a64958096718 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -296,7 +296,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.
-  __attribute__ ((__noreturn__, __always_inline__))
+  extern "C++" __attribute__ ((__noreturn__, __always_inline__))
   inline void __terminate() _GLIBCXX_USE_NOEXCEPT
   {
     void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__));