libstdc++: Move __glibcxx_assert_fail to its own file

This avoids a dependency on the other symbols in src/c++11/debug.o when
linking statically to libstdc++.a without using -Wl,--gc-sections.

libstdc++-v3/ChangeLog:

	* src/c++11/Makefile.am: Add new file.
	* src/c++11/Makefile.in: Regenerate.
	* src/c++11/debug.cc (__glibcxx_assert_fail): Move to ...
	* src/c++11/assert_fail.cc: New file.

(cherry picked from commit c7db9000fa7caceadb4e72dcc6226abebf7a6239)

diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am
index 222e2a8c618d693268025cd7b968a31c17ed95b9..2198db1617d5ef6c66befa5ce5913f1b6bc84048 100644 (file)
--- a/libstdc++-v3/src/c++11/Makefile.am
+++ b/libstdc++-v3/src/c++11/Makefile.am
@@ -52,6 +52,7 @@ cxx11_abi_sources =
 endif
 
 sources = \
+       assert_fail.cc \
        chrono.cc \
        codecvt.cc \
        condition_variable.cc \

diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in
index 892c505eddc6c235a3efd611fb7e81e8888875b9..8005fa6253c295d4c3ea8006a8977de0dce0317d 100644 (file)
--- a/libstdc++-v3/src/c++11/Makefile.in
+++ b/libstdc++-v3/src/c++11/Makefile.in
@@ -127,9 +127,9 @@ libc__11convenience_la_LIBADD =
 @ENABLE_DUAL_ABI_TRUE@ cxx11-ios_failure.lo \
 @ENABLE_DUAL_ABI_TRUE@ cxx11-shim_facets.lo cxx11-stdexcept.lo
 am__objects_2 = ctype_configure_char.lo ctype_members.lo
-am__objects_3 = chrono.lo codecvt.lo condition_variable.lo \
-       cow-stdexcept.lo ctype.lo debug.lo functexcept.lo \
-       functional.lo futex.lo future.lo hash_c++0x.lo \
+am__objects_3 = assert_fail.lo chrono.lo codecvt.lo \
+       condition_variable.lo cow-stdexcept.lo ctype.lo debug.lo \
+       functexcept.lo functional.lo futex.lo future.lo hash_c++0x.lo \
        hashtable_c++0x.lo ios.lo limits.lo mutex.lo placeholders.lo \
        random.lo regex.lo shared_ptr.lo snprintf_lite.lo \
        system_error.lo thread.lo $(am__objects_1) $(am__objects_2)
@@ -466,6 +466,7 @@ host_sources = \
 @ENABLE_DUAL_ABI_TRUE@ cxx11-stdexcept.cc
 
 sources = \
+       assert_fail.cc \
        chrono.cc \
        codecvt.cc \
        condition_variable.cc \

diff --git a/libstdc++-v3/src/c++11/assert_fail.cc b/libstdc++-v3/src/c++11/assert_fail.cc
new file mode 100644 (file)
index 0000000..540e953
--- /dev/null
+++ b/libstdc++-v3/src/c++11/assert_fail.cc
@@ -0,0 +1,44 @@
+// Debugging mode support code -*- C++ -*-
+
+// Copyright (C) 2021-2023 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+#include <cstdio>      // for std::fprintf, stderr
+#include <cstdlib>     // for std::abort
+
+#ifdef _GLIBCXX_VERBOSE_ASSERT
+namespace std
+{
+  [[__noreturn__]]
+  void
+  __glibcxx_assert_fail(const char* file, int line,
+                       const char* function, const char* condition) noexcept
+  {
+    if (file && function && condition)
+      fprintf(stderr, "%s:%d: %s: Assertion '%s' failed.\n",
+             file, line, function, condition);
+    else if (function)
+      fprintf(stderr, "%s: Undefined behavior detected.\n", function);
+    abort();
+  }
+}
+#endif

diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc
index 1bfc6ccc581620b7de402d04ccaba980e2f0ea14..88dca83ce1a0ec1e5e3120d0a62b31e1757b0055 100644 (file)
--- a/libstdc++-v3/src/c++11/debug.cc
+++ b/libstdc++-v3/src/c++11/debug.cc
@@ -45,24 +45,6 @@
 
 #include "mutex_pool.h"
 
-#ifdef _GLIBCXX_VERBOSE_ASSERT
-namespace std
-{
-  [[__noreturn__]]
-  void
-  __glibcxx_assert_fail(const char* file, int line,
-                       const char* function, const char* condition) noexcept
-  {
-    if (file && function && condition)
-      fprintf(stderr, "%s:%d: %s: Assertion '%s' failed.\n",
-             file, line, function, condition);
-    else if (function)
-      fprintf(stderr, "%s: Undefined behavior detected.\n", function);
-    abort();
-  }
-}
-#endif
-
 using namespace std;
 
 namespace