diff options
author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-25 20:28:03 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-26 09:21:57 +0200 |
commit | bd215ef170fb85b7572b617dacdeab26edd3d21c (patch) | |
tree | e8711e06ba51c63ca867037ce940ca0c9258959e /libpthread/nptl/sysdeps/unix/sysv/linux/raise.c | |
parent | 56741422790d9a6ff74c4397d914f540a1be273d (diff) |
always assume tgkill is present
We do not support 2.4 Linux kernels anyway, and almost
all newer 2.6 kernels should have tgkill syscall.
Cleanup the raise situation, pt-raise.c is unused, sync
raise.c with latest GNU libc.
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
Diffstat (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/raise.c')
-rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/raise.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c b/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c index 8aa4830c0..6b159384f 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -21,17 +21,13 @@ #include <signal.h> #include <sysdep.h> #include <pthreadP.h> -#include <bits/kernel-features.h> int -raise ( - int sig) +raise (int sig) { struct pthread *pd = THREAD_SELF; -#if (defined(__ASSUME_TGKILL) && __ASSUME_TGKILL) || defined __NR_tgkill pid_t pid = THREAD_GETMEM (pd, pid); -#endif pid_t selftid = THREAD_GETMEM (pd, tid); if (selftid == 0) { @@ -44,30 +40,17 @@ raise ( #endif THREAD_SETMEM (pd, tid, selftid); -#if (defined(__ASSUME_TGKILL) && __ASSUME_TGKILL) || defined __NR_tgkill /* We do not set the PID field in the TID here since we might be called from a signal handler while the thread executes fork. */ pid = selftid; -#endif } -#if (defined(__ASSUME_TGKILL) && __ASSUME_TGKILL) || defined __NR_tgkill else /* raise is an async-safe function. It could be called while the fork/vfork function temporarily invalidated the PID field. Adjust for that. */ if (__builtin_expect (pid <= 0, 0)) pid = (pid & INT_MAX) == 0 ? selftid : -pid; -#endif -#if defined(__ASSUME_TGKILL) && __ASSUME_TGKILL return INLINE_SYSCALL (tgkill, 3, pid, selftid, sig); -#else -# ifdef __NR_tgkill - int res = INLINE_SYSCALL (tgkill, 3, pid, selftid, sig); - if (res != -1 || errno != ENOSYS) - return res; -# endif - return INLINE_SYSCALL (tkill, 2, selftid, sig); -#endif } libc_hidden_def (raise) |