about summary refs log tree commit diff
path: root/nptl/sysdeps/unix/sysv/linux/pt-raise.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-08-08 23:22:53 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-08-08 23:22:53 +0000
commitb36137f1d6899010a8e6d8f6e91a801a6b9d03f4 (patch)
treed1f290f98129694fb7f3e5141e953b53a821f3b8 /nptl/sysdeps/unix/sysv/linux/pt-raise.c
parent44c94c1da0d243a20539ae326567eb6dc4e1f540 (diff)
downloadglibc-b36137f1d6899010a8e6d8f6e91a801a6b9d03f4.tar.gz
glibc-b36137f1d6899010a8e6d8f6e91a801a6b9d03f4.tar.xz
glibc-b36137f1d6899010a8e6d8f6e91a801a6b9d03f4.zip
Remove __ASSUME_TGKILL.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/pt-raise.c')
-rw-r--r--nptl/sysdeps/unix/sysv/linux/pt-raise.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/pt-raise.c b/nptl/sysdeps/unix/sysv/linux/pt-raise.c
index 39ba5d3097..71face45ac 100644
--- a/nptl/sysdeps/unix/sysv/linux/pt-raise.c
+++ b/nptl/sysdeps/unix/sysv/linux/pt-raise.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 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.
 
@@ -27,25 +27,13 @@ int
 raise (sig)
      int sig;
 {
-#if __ASSUME_TGKILL || defined __NR_tgkill
   /* raise is an async-safe function.  It could be called while the
      fork function temporarily invalidated the PID field.  Adjust for
      that.  */
   pid_t pid = THREAD_GETMEM (THREAD_SELF, pid);
   if (__builtin_expect (pid < 0, 0))
     pid = -pid;
-#endif
 
-#if __ASSUME_TGKILL
   return INLINE_SYSCALL (tgkill, 3, pid, THREAD_GETMEM (THREAD_SELF, tid),
 			 sig);
-#else
-# ifdef __NR_tgkill
-  int res = INLINE_SYSCALL (tgkill, 3, pid, THREAD_GETMEM (THREAD_SELF, tid),
-			    sig);
-  if (res != -1 || errno != ENOSYS)
-    return res;
-# endif
-  return INLINE_SYSCALL (tkill, 2, THREAD_GETMEM (THREAD_SELF, tid), sig);
-#endif
 }