From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 1EF0C3858D38; Mon, 11 Sep 2023 16:07:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1EF0C3858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694448456; bh=SnzTFCN6M60HbQg7RsXwFSI+Gh0Cm6nFqE2cimUOvJ0=; h=From:To:Subject:Date:From; b=tz9OBogJRmhRPKQBZirJDSFUEw/QL+hm8fM6VtWHe3qpDhbCPe0DGYKiRmYp/qvYh lOpuDma/iBip6yjPvxfmjDriiDO6hiBsilyMHl2snLO8kbmgZRM6I518ULMN0h0uGg YeMH/ms5oxSDVQQxBSSSiMcNRopWAHKG+DGm2sro= 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 r14-3845] libstdc++: Move __glibcxx_assert_fail to its own file X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 286655d04678cb61dee9cac43b139571247c4ad1 X-Git-Newrev: c7db9000fa7caceadb4e72dcc6226abebf7a6239 Message-Id: <20230911160736.1EF0C3858D38@sourceware.org> Date: Mon, 11 Sep 2023 16:07:36 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c7db9000fa7caceadb4e72dcc6226abebf7a6239 commit r14-3845-gc7db9000fa7caceadb4e72dcc6226abebf7a6239 Author: Jonathan Wakely Date: Mon Sep 11 15:58:48 2023 +0100 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. Diff: --- libstdc++-v3/src/c++11/Makefile.am | 1 + libstdc++-v3/src/c++11/Makefile.in | 7 +++--- libstdc++-v3/src/c++11/assert_fail.cc | 44 +++++++++++++++++++++++++++++++++++ libstdc++-v3/src/c++11/debug.cc | 18 -------------- 4 files changed, 49 insertions(+), 21 deletions(-) diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am index 682be1669a41..e7495dcccef7 100644 --- a/libstdc++-v3/src/c++11/Makefile.am +++ b/libstdc++-v3/src/c++11/Makefile.am @@ -56,6 +56,7 @@ sources_freestanding = \ placeholders.cc 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 e7a09fe32469..a10e05977bcb 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -127,9 +127,9 @@ am__objects_1 = limits.lo placeholders.lo @ENABLE_DUAL_ABI_TRUE@ cxx11-ios_failure.lo \ @ENABLE_DUAL_ABI_TRUE@ cxx11-shim_facets.lo cxx11-stdexcept.lo am__objects_3 = ctype_configure_char.lo ctype_members.lo -am__objects_4 = 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_4 = 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 ios_errcat.lo mutex.lo random.lo \ regex.lo shared_ptr.lo snprintf_lite.lo system_error.lo \ thread.lo $(am__objects_2) $(am__objects_3) @@ -475,6 +475,7 @@ sources_freestanding = \ placeholders.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 index 000000000000..540e953da2e8 --- /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 +// . + +#include // for std::fprintf, stderr +#include // 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 926e8be6122a..f40e995e0f30 100644 --- 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