aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2024-06-28 15:14:15 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2024-06-28 20:19:02 +0100
commit52370c839edd04df86d3ff2b71fcdca0c7376a7f (patch)
treeb2a5f9c57f9125994e8147c0556bdf5f9c03c9cf
parentfab60eaa94b50b1eea84f0d001004c851d4c781b (diff)
downloadgcc-52370c839edd04df86d3ff2b71fcdca0c7376a7f.zip
gcc-52370c839edd04df86d3ff2b71fcdca0c7376a7f.tar.gz
gcc-52370c839edd04df86d3ff2b71fcdca0c7376a7f.tar.bz2
libstdc++: Define __glibcxx_assert_fail for non-verbose build [PR115585]
When the library is configured with --disable-libstdcxx-verbose the assertions just abort instead of calling __glibcxx_assert_fail, and so I didn't export that function for the non-verbose build. However, that option is documented to not change the library ABI, so we still need to export the symbol from the library. It could be needed by programs compiled against the headers from a verbose build. The non-verbose definition can just call abort so that it doesn't pull in I/O symbols, which are unwanted in a non-verbose build. libstdc++-v3/ChangeLog: PR libstdc++/115585 * src/c++11/assert_fail.cc (__glibcxx_assert_fail): Add definition for non-verbose builds.
-rw-r--r--libstdc++-v3/src/c++11/assert_fail.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/src/c++11/assert_fail.cc b/libstdc++-v3/src/c++11/assert_fail.cc
index 6d99c79..76c8a5a 100644
--- a/libstdc++-v3/src/c++11/assert_fail.cc
+++ b/libstdc++-v3/src/c++11/assert_fail.cc
@@ -22,10 +22,10 @@
// 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
+#include <cstdio> // for std::fprintf, stderr
namespace std
{
[[__noreturn__]]
@@ -41,4 +41,12 @@ namespace std
abort();
}
}
+#else
+namespace std
+{
+ [[__noreturn__]]
+ void
+ __glibcxx_assert_fail(const char*, int, const char*, const char*) noexcept
+ { abort(); }
+}
#endif