From 590ae09af786be17812fffad0c43b4c6a1f697f8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 8 Jul 2015 21:51:48 -0500 Subject: builtin_unreachable is not available for older gcc --- ldso/include/dl-syscall.h | 2 +- libpthread/nptl/forward.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 0acd2ba4a..46ba07e2e 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) +#if defined __GNUC__ && (!__GNUC_PREREQ (4, 4) && !__GNUC_PREREQ (4, 2)) __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 a5c97babd..48d38d9aa 100644 --- a/libpthread/nptl/forward.c +++ b/libpthread/nptl/forward.c @@ -160,6 +160,10 @@ 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)) __builtin_unreachable(); +#else + while(1); +#endif }) #undef return -- cgit v1.2.3