summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-07-08 21:51:48 -0500
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2015-07-11 10:51:24 +0200
commit590ae09af786be17812fffad0c43b4c6a1f697f8 (patch)
tree7d4109c5133fab0753bfc0dda3045561c220d55b
parentf347524fade67b41fb8e46283a6f0ae4aa19e6b0 (diff)
builtin_unreachable is not available for older gcc
-rw-r--r--ldso/include/dl-syscall.h2
-rw-r--r--libpthread/nptl/forward.c4
2 files changed, 5 insertions, 1 deletions
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