From cca9684f2d7a74fc0b28bfb1859955e0e28d7b4b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 3 Aug 2022 11:41:53 +0200 Subject: stdio: Clean up __libc_message after unconditional abort Since commit ec2c1fcefb200c6cb7e09553f3c6af8815013d83 ("malloc: Abort on heap corruption, without a backtrace [BZ #21754]"), __libc_message always terminates the process. Since commit a289ea09ea843ced6e5277c2f2e63c357bc7f9a3 ("Do not print backtraces on fatal glibc errors"), the backtrace facility has been removed. Therefore, remove enum __libc_message_action and the action argument of __libc_message, and mark __libc_message as _No_return. Reviewed-by: Adhemerval Zanella --- debug/fortify_fail.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'debug') diff --git a/debug/fortify_fail.c b/debug/fortify_fail.c index b1c51662b7..b880f82cb6 100644 --- a/debug/fortify_fail.c +++ b/debug/fortify_fail.c @@ -21,8 +21,6 @@ void __attribute__ ((noreturn)) __fortify_fail (const char *msg) { - /* The loop is added only to keep gcc happy. */ - while (1) - __libc_message (do_abort, "*** %s ***: terminated\n", msg); + __libc_message ("*** %s ***: terminated\n", msg); } libc_hidden_def (__fortify_fail) -- cgit v1.2.3