From 9001cb1102cddba54f0e84e147dfbb0356067356 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 3 Aug 2022 11:41:53 +0200 Subject: assert: Do not use stderr in libc-internal assert Redirect internal assertion failures to __libc_assert_fail, based on based on __libc_message, which writes directly to STDERR_FILENO and calls abort. Also disable message translation and reword the error message slightly (adjusting stdlib/tst-bz20544 accordingly). As a result of these changes, malloc no longer needs its own redefinition of __assert_fail. __libc_assert_fail needs to be stubbed out during rtld dependency analysis because the rtld rebuilds turn __libc_assert_fail into __assert_fail, which is unconditionally provided by elf/dl-minimal.c. This change is not possible for the public assert macro and its __assert_fail function because POSIX requires that the diagnostic is written to stderr. Reviewed-by: Adhemerval Zanella --- assert/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'assert/Makefile') diff --git a/assert/Makefile b/assert/Makefile index f7cf8e9b77..c905845a43 100644 --- a/assert/Makefile +++ b/assert/Makefile @@ -24,7 +24,12 @@ include ../Makeconfig headers := assert.h -routines := assert assert-perr __assert +routines := \ + __assert \ + __libc_assert_fail \ + assert \ + assert-perr \ + # routines tests := test-assert test-assert-perr tst-assert-c++ tst-assert-g++ ifeq ($(have-cxx-thread_local),yes) -- cgit v1.2.3