Remove __ASSUME_TGKILL.

diff --git a/ChangeLog b/ChangeLog
index 7dbea5e..6e0f610 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-08  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_TGKILL):
+       Remove.
+
 2012-08-08  Roland McGrath  <roland@hack.frob.com>
 
        * sysdeps/posix/fdopendir.c: Include <stddef.h>.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1f0d925..1deaa6a 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,26 @@
+2012-08-08  Joseph Myers  <joseph@codesourcery.com>
+
+       * allocatestack.c (setxid_signal_thread) [__ASSUME_TGKILL]: Make
+       code unconditional.
+       (setxid_signal_thread) [!__ASSUME_TGKILL]: Remove conditional code.
+       * pthread_cancel.c (pthread_cancel) [__ASSUME_TGKILL]: Make code
+       unconditional.
+       (pthread_cancel) [!__ASSUME_TGKILL]: Remove conditional code.
+       * sysdeps/pthread/createthread.c (do_clone) [__ASSUME_TGKILL]:
+       Make code unconditional.
+       (do_clone) [!__ASSUME_TGKILL]: Remove conditional code.
+       * sysdeps/unix/sysv/linux/pt-raise.c (raise) [__ASSUME_TGKILL ||
+       __NR_tgkill]: Make code unconditional.
+       (raise) [__ASSUME_TGKILL]: Likewise.
+       (raise) [!__ASSUME_TGKILL]: Remove conditional code.
+       * sysdeps/unix/sysv/linux/pthread_kill.c (__pthread_kill)
+       [__ASSUME_TGKILL]: Make code unconditional.
+       (__pthread_kill) [!__ASSUME_TGKILL]: Remove conditional code.
+       * sysdeps/unix/sysv/linux/raise.c (raise) [__ASSUME_TGKILL ||
+       __NR_tgkill]: Make code unconditional.
+       (raise) [__ASSUME_TGKILL]: Likewise.
+       (raise) [!__ASSUME_TGKILL]: Remove conditional code.
+
 2012-08-07  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/pthread/createthread.c (create_thread)

diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 79c4531..799dbe3 100644 (file)
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2007, 2009, 2010, 2011 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.
 
@@ -1037,18 +1037,8 @@ setxid_signal_thread (struct xid_command *cmdp, struct pthread *t)
 
   int val;
   INTERNAL_SYSCALL_DECL (err);
-#if __ASSUME_TGKILL
   val = INTERNAL_SYSCALL (tgkill, err, 3, THREAD_GETMEM (THREAD_SELF, pid),
                          t->tid, SIGSETXID);
-#else
-# ifdef __NR_tgkill
-  val = INTERNAL_SYSCALL (tgkill, err, 3, THREAD_GETMEM (THREAD_SELF, pid),
-                         t->tid, SIGSETXID);
-  if (INTERNAL_SYSCALL_ERROR_P (val, err)
-      && INTERNAL_SYSCALL_ERRNO (val, err) == ENOSYS)
-# endif
-    val = INTERNAL_SYSCALL (tkill, err, 2, t->tid, SIGSETXID);
-#endif
 
   /* If this failed, it must have had not started yet or else exited.  */
   if (!INTERNAL_SYSCALL_ERROR_P (val, err))

diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c
index 1bfca63..cf6e48b 100644 (file)
--- 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);

diff --git a/nptl/sysdeps/pthread/createthread.c b/nptl/sysdeps/pthread/createthread.c
index d58f8fa..e8e10dc 100644 (file)
--- a/nptl/sysdeps/pthread/createthread.c
+++ b/nptl/sysdeps/pthread/createthread.c
@@ -109,13 +109,9 @@ do_clone (struct pthread *pd, const struct pthread_attr *attr,
                 send it the cancellation signal.  */
              INTERNAL_SYSCALL_DECL (err2);
            err_out:
-#if __ASSUME_TGKILL
              (void) INTERNAL_SYSCALL (tgkill, err2, 3,
                                       THREAD_GETMEM (THREAD_SELF, pid),
                                       pd->tid, SIGCANCEL);
-#else
-             (void) INTERNAL_SYSCALL (tkill, err2, 2, pd->tid, SIGCANCEL);
-#endif
 
              /* We do not free the stack here because the canceled thread
                 itself will do this.  */

diff --git a/nptl/sysdeps/unix/sysv/linux/pt-raise.c b/nptl/sysdeps/unix/sysv/linux/pt-raise.c
index 39ba5d3..71face4 100644 (file)
--- 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
 }

diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_kill.c b/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
index b2a1422..6804bf2 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
+++ b/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2006, 2011 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.
 
@@ -58,18 +58,8 @@ __pthread_kill (threadid, signo)
      fork, it would have to happen in a signal handler.  But this is
      no allowed, pthread_kill is not guaranteed to be async-safe.  */
   int val;
-#if __ASSUME_TGKILL
   val = INTERNAL_SYSCALL (tgkill, err, 3, THREAD_GETMEM (THREAD_SELF, pid),
                          tid, signo);
-#else
-# ifdef __NR_tgkill
-  val = INTERNAL_SYSCALL (tgkill, err, 3, THREAD_GETMEM (THREAD_SELF, pid),
-                         tid, signo);
-  if (INTERNAL_SYSCALL_ERROR_P (val, err)
-      && INTERNAL_SYSCALL_ERRNO (val, err) == ENOSYS)
-# endif
-    val = INTERNAL_SYSCALL (tkill, err, 2, tid, signo);
-#endif
 
   return (INTERNAL_SYSCALL_ERROR_P (val, err)
          ? INTERNAL_SYSCALL_ERRNO (val, err) : 0);

diff --git a/nptl/sysdeps/unix/sysv/linux/raise.c b/nptl/sysdeps/unix/sysv/linux/raise.c
index 0664278..268ab46 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/raise.c
+++ b/nptl/sysdeps/unix/sysv/linux/raise.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 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.
 
@@ -29,9 +29,7 @@ raise (sig)
      int sig;
 {
   struct pthread *pd = THREAD_SELF;
-#if __ASSUME_TGKILL || defined __NR_tgkill
   pid_t pid = THREAD_GETMEM (pd, pid);
-#endif
   pid_t selftid = THREAD_GETMEM (pd, tid);
   if (selftid == 0)
     {
@@ -44,31 +42,18 @@ raise (sig)
 #endif
       THREAD_SETMEM (pd, tid, selftid);
 
-#if __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 __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 __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)
 weak_alias (raise, gsignal)

diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 45061b2..97c4db6 100644 (file)
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,8 @@
+2012-08-08  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/alpha/kernel-features.h
+       (__ASSUME_TGKILL): Remove.
+
 2012-08-08  Richard Henderson  <rth@redhat.com>
 
        * sysdeps/unix/sysv/linux/alpha/kernel-features.h

diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 5d4a0e8..d517206 100644 (file)
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2012-08-08  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/m68k/kernel-features.h
+       (__ASSUME_TGKILL): Remove.
+
 2012-08-08  Andreas Schwab  <schwab@linux-m68k.org>
 
        * sysdeps/m68k/coldfire/fpu/bits/mathinline.h: New file.

diff --git a/ports/ChangeLog.tile b/ports/ChangeLog.tile
index 05f08bd..164a7e6 100644 (file)
--- a/ports/ChangeLog.tile
+++ b/ports/ChangeLog.tile
@@ -1,3 +1,8 @@
+2012-08-08  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/tile/kernel-features.h
+       (__ASSUME_TGKILL): Remove.
+
 2012-08-02  Chris Metcalf  <cmetcalf@tilera.com>
 
        * sysdeps/tile/sysdep.h: Do not define ASM_TYPE_DIRECTIVE.

diff --git a/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
index a4e8de9..ee349bc 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+++ b/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
@@ -20,9 +20,6 @@
 #ifndef _KERNEL_FEATURES_H
 #define _KERNEL_FEATURES_H 1
 
-/* The tgkill syscall was introduced for alpha 2.6.0-test1.  */
-#define __ASSUME_TGKILL        1
-
 #define __ASSUME_UTIMES        1
 
 /* Support for the O_CLOEXEC flag was added for alpha in 2.6.23.  */

diff --git a/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
index 3196cbb..4a8b585 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
+++ b/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
@@ -22,7 +22,6 @@
 #define __ASSUME_STAT64_SYSCALL        1
 
 /* Many syscalls were added in 2.6.10 for m68k.  */
-#define __ASSUME_TGKILL        1
 #define __ASSUME_UTIMES        1
 #define __ASSUME_FADVISE64_64_SYSCALL  1
 

diff --git a/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h b/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
index 766b4ad..3c00344 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
+++ b/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
@@ -21,7 +21,6 @@
 #define __ASSUME_MMAP2_SYSCALL         1
 #define __ASSUME_STAT64_SYSCALL                1
 #define __ASSUME_CLONE_THREAD_FLAGS    1
-#define __ASSUME_TGKILL                        1
 #define __ASSUME_UTIMES                        1
 #define __ASSUME_FADVISE64_64_SYSCALL  1
 #define __ASSUME_O_CLOEXEC             1

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 9f0a8e6..21fba88 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -113,13 +113,6 @@
 /* The statfs64 syscalls are available in 2.5.74 (but not for alpha).  */
 #define __ASSUME_STATFS64      1
 
-/* The tgkill syscall was instroduced for i386 in 2.5.75.  On x86-64,
-   sparc, SH, ppc, and ppc64 it was introduced in 2.6.0-test3. */
-#if (defined __i386__ || defined __x86_64__ || defined __powerpc__     \
-     || defined __sh__ || defined __sparc__)
-# define __ASSUME_TGKILL       1
-#endif
-
 /* The utimes syscall has been available for some architectures
    forever.  For x86 it was introduced after 2.5.75, for x86-64,
    ppc, and ppc64 it was introduced in 2.6.0-test3.  */