diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-08-08 23:22:53 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-08-08 23:22:53 +0000 |
| commit | b36137f1d6899010a8e6d8f6e91a801a6b9d03f4 (patch) | |
| tree | d1f290f98129694fb7f3e5141e953b53a821f3b8 /nptl/pthread_cancel.c | |
| parent | 44c94c1da0d243a20539ae326567eb6dc4e1f540 (diff) | |
Remove __ASSUME_TGKILL.
Diffstat (limited to 'nptl/pthread_cancel.c')
| -rw-r--r-- | nptl/pthread_cancel.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c index 1bfca63581..cf6e48b414 100644 --- a/nptl/pthread_cancel.c +++ b/nptl/pthread_cancel.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -75,20 +75,9 @@ pthread_cancel (th) a signal handler. But this is no allowed, pthread_cancel is not guaranteed to be async-safe. */ int val; -#if __ASSUME_TGKILL val = INTERNAL_SYSCALL (tgkill, err, 3, THREAD_GETMEM (THREAD_SELF, pid), pd->tid, SIGCANCEL); -#else -# ifdef __NR_tgkill - val = INTERNAL_SYSCALL (tgkill, err, 3, - THREAD_GETMEM (THREAD_SELF, pid), pd->tid, - SIGCANCEL); - if (INTERNAL_SYSCALL_ERROR_P (val, err) - && INTERNAL_SYSCALL_ERRNO (val, err) == ENOSYS) -# endif - val = INTERNAL_SYSCALL (tkill, err, 2, pd->tid, SIGCANCEL); -#endif if (INTERNAL_SYSCALL_ERROR_P (val, err)) result = INTERNAL_SYSCALL_ERRNO (val, err); |