From 7966d8aca0af0048b3d82bc9af210c293a4c9aac Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 25 Jul 2015 19:42:41 +0200 Subject: simplify, as the other does not work correctly, suggested by tg --- ldso/include/dl-syscall.h | 2 +- libpthread/nptl/forward.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 46ba07e2e..5528ba6a0 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -51,7 +51,7 @@ extern int _dl_errno; static __always_inline attribute_noreturn __cold void _dl_exit(int status) { INLINE_SYSCALL(_dl_exit, 1, status); -#if defined __GNUC__ && (!__GNUC_PREREQ (4, 4) && !__GNUC_PREREQ (4, 2)) +#if __GNUC_PREREQ(4, 5) __builtin_unreachable(); /* shut up warning: 'noreturn' function does return*/ #else while (1); diff --git a/libpthread/nptl/forward.c b/libpthread/nptl/forward.c index 48d38d9aa..076d43711 100644 --- a/libpthread/nptl/forward.c +++ b/libpthread/nptl/forward.c @@ -160,7 +160,7 @@ FORWARD2(__pthread_unwind, /* We cannot call abort() here. */ INTERNAL_SYSCALL_DECL (err); INTERNAL_SYSCALL (kill, err, 1, SIGKILL); -#if defined __GNUC__ && (!__GNUC_PREREQ (4, 4) && !__GNUC_PREREQ (4, 2)) +#if __GNUC_PREREQ(4, 5) __builtin_unreachable(); #else while(1); -- cgit v1.2.3