hppa: Update nptl/pthread.h to match generic file

diff --git a/ChangeLog.hppa b/ChangeLog.hppa
index 7dd7ce6..50a15d7 100644 (file)
--- a/ChangeLog.hppa
+++ b/ChangeLog.hppa
@@ -1,3 +1,8 @@
+2010-06-07  Andreas Schwab  <schwab@redhat.com>
+
+       * sysdeps/unix/sysv/linux/hppa/nptl/pthread.h: Update to agree
+       with generic file.
+
 2010-03-30  Carlos O'Donell <carlos@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/hppa/bits/socket.h: Define
@@ -21,7 +26,7 @@
 2010-02-02  Carlos O'Donell  <carlos@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/hppa/makecontext.c (__makecontext):
-       Support more than 8 arguments. 
+       Support more than 8 arguments.
 
 2010-02-01  Kyle McMartin  <kyle@redhat.com>
 
@@ -48,7 +53,7 @@
 
        * sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h:
        Use correct alignment for pthread_mutex_t, pthread_cond_t,
-       and pthread_rwlock_t.  
+       and pthread_rwlock_t.
 
 2009-11-22  Carlos O'Donell  <carlos@codesourcery.com>
 
@@ -64,7 +69,7 @@
 
 2009-11-15  Carlos O'Donell  <carlos@codesourcery.com>
 
-       * sysdeps/unix/sysv/linux/hppa/Versions (libc): Add 
+       * sysdeps/unix/sysv/linux/hppa/Versions (libc): Add
        fallocate64@@GLIBC_2.11.
        * sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
        [__USE_GNU]: Define F_GETOWN_EX, and F_SETOWN_EX.
@@ -72,7 +77,7 @@
        [__USE_FILE_OFFSET64 && __REDIRECT]: Define __REDIRECT.
        [__USE_FILE_OFFSET64 && !__REDIRECT]: Define fallocate as
        fallocate64.
-       [__USE_LARGEFILE64]: define fallocate64.        
+       [__USE_LARGEFILE64]: define fallocate64.
 
 2009-11-15  Carlos O'Donell  <carlos@codesourcery.com>
 
@@ -108,10 +113,10 @@
        * sysdeps/unix/sysv/linux/hppa/nptl/unwind-resume.c: Remove.
 
 2009-09-08  Carlos O'Donell  <carlos@codesourcery.com>
- 
+
        sysdeps/unix/sysv/linux/hppa/
        * internaltypes.h: New file.
- 
+
        sysdeps/unix/sysv/linux/hppa/nptl/
        * pthreadP.h: New file.
        * pthread.h: New file.
@@ -159,7 +164,7 @@
 
 2009-02-25  Carlos O'Donell  <carlos@codesourcery.com>
 
-       * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Define 
+       * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Define
        FUTEX_WAIT_BITSET, FUTEX_WAKE_BITSET, FUTEX_CLOCK_REALTIME,
        and FUTEX_BITSET_MATCH_ANY.
 
@@ -173,7 +178,7 @@
 
 2009-02-13  Khem Raj  <raj.khem@gmail.com>
 
-       * sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c 
+       * sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c
        (libgcc_s_handle): New variable.
        (pthread_cancel_init): Depend in libgcc_s_handle for decision to
        load DSO.  Assign last.
@@ -201,9 +206,9 @@
            Carlos O'Donell  <carlos@systemhalted.org>
 
        [BZ #6037]
-       * sysdeps/unix/sysv/linux/hppa/bits/atomic.h: Check for -11 
+       * sysdeps/unix/sysv/linux/hppa/bits/atomic.h: Check for -11
        (-EAGAIN) instead of 11. Loop again when the kernel
-       returns -45 (-EDEADLOCK). Add back memory clobber. 
+       returns -45 (-EDEADLOCK). Add back memory clobber.
        Do not initialize lws_ret and lws_errno.
 
 2008-06-17  Guy Martin  <gmsoft@tuxicoman.be>
@@ -237,7 +242,7 @@
            Guy Martin <gmsoft@tuxicoman.be>
 
        [BZ #5923]
-       * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Pass 
+       * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Pass
        timespec and futexp.
 
 2008-02-22  Carlos O'Donell  <carlos@codesourcery.com>
@@ -385,7 +390,7 @@
 
 2007-05-17  Carlos O'Donell  <carlos@systemhalted.org>
 
-       * sysdeps/unix/sysv/linux/hppa/nptl/bits/semaphore.h 
+       * sysdeps/unix/sysv/linux/hppa/nptl/bits/semaphore.h
        (SEM_VALUE_MAX): Remove.
 
 2007-05-17  Carlos O'Donell  <carlos@systemhalted.org>
@@ -395,14 +400,14 @@
        (INLINE_SYSCALL): Use PIC_REG_DEF, PIC_REG_USE.
        (INTERNAL_SYSCALL): Likewise.
        (INTERNAL_SYSCALL_NCS): Likewise.
-       * sysdeps/unix/sysv/linux/hppa/sysdep.c (syscall): Use 
+       * sysdeps/unix/sysv/linux/hppa/sysdep.c (syscall): Use
        PIC_REG_DEF, PIC_REG_USE.
 
 2007-05-01  Carlos O'Donell  <carlos@systemhalted.org>
 
        * sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h
-       [__USE_XOPEN2K]: Define pthread_rwlock_t and 
-       pthread_rwlockattr_t. 
+       [__USE_XOPEN2K]: Define pthread_rwlock_t and
+       pthread_rwlockattr_t.
 
 2007-02-02  Carlos O'Donell  <carlos@systemhalted.org>
 
@@ -436,18 +441,18 @@
 2006-09-20  Carlos O'Donell  <carlos@systemhalted.org>
 
        * sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (splice): Add offin
-       and offout arguments to the prototype. 
+       and offout arguments to the prototype.
 
 2006-09-15  Carlos O'Donell  <carlos@systemhalted.org>
 
        * sysdeps/hppa/nptl/tcb-offsets.sym: Define TID_THREAD_OFFSET.
-       * sysdeps/unix/sysv/linux/hppa/clone.S: Handle RESET_PID, and 
+       * sysdeps/unix/sysv/linux/hppa/clone.S: Handle RESET_PID, and
        restore r19 before call to _exit.
        * sysdeps/unix/sysv/linux/hppa/nptl/clone.S: New file.
 
 2006-09-13  Carlos O'Donell  <carlos@systemhalted.org>
 
-       * sysdeps/hppa/dl-machine.h (RTLD_START): Comment the use of 
+       * sysdeps/hppa/dl-machine.h (RTLD_START): Comment the use of
        _dl_fini_plabel.
        * sysdeps/hppa/elf/start.S: Correctly pass r23 to argument 6 of
        __libc_start_main. Comment the order of arguments at entry and
@@ -467,7 +472,7 @@
        as -EAGAIN.
        * sysdeps/unix/sysv/linux/hppa/bits/mman.h: Adjust definitions to
        match required standards.
-       * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h 
+       * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
        (lll_futex_wait): Return __ret.
        (lll_futex_timed_wait): Likewise.
        (lll_futex_wake): Likewise.
@@ -490,7 +495,7 @@
 
 2006-07-24  Carlos O'Donell  <carlos@systemhalted.org>
 
-       * sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h: 
+       * sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h:
        __SIZEOF_PTHREAD_COND_T is 64 bytes. Remove __PAD_ATOMIC_LOCK_T.
 
 2006-07-18  Carlos O'Donell  <carlos@systemhalted.org>
@@ -516,7 +521,7 @@
 
        * sysdeps/unix/sysv/linux/hppa/xstat.c: New file.
        * sysdeps/unix/sysv/linux/hppa/lxstat.c: Likewise.
-       * sysdeps/unix/sysv/linux/hppa/fxstat.c: Likewise. 
+       * sysdeps/unix/sysv/linux/hppa/fxstat.c: Likewise.
        * sysdeps/unix/sysv/linux/hppa/fxstatat.c: Likewise.
 
 2006-07-13  Carlos O'Donell  <carlos@systemhalted.org>
@@ -545,12 +550,12 @@
 
 2006-06-08  Carlos O'Donell  <carlos@systemhalted.org>
 
-       * sysdeps/unix/sysv/linux/hppa/Versions: new errlist compat entry 
+       * sysdeps/unix/sysv/linux/hppa/Versions: new errlist compat entry
        for up to 256 errnos
 
 2006-06-08  Carlos O'Donell  <carlos@systemhalted.org>
 
-       * sysdeps/hppa/hppa1.1/Implies: Remove ieee754/ldbl-128. 
+       * sysdeps/hppa/hppa1.1/Implies: Remove ieee754/ldbl-128.
        * sysdeps/unix/sysv/linux/hppa/kernel-features.h
        [__LINUX_KERNEL_VERSION >= 0x020609]: Define __ASSUME_LWS_CAS.
        * sysdeps/unix/sysv/linux/hppa/bits/atomic.h: New file.
@@ -648,9 +653,9 @@
 
 2006-04-19  Carlos O'Donell  <carlos@systemhalted.org>
 
-       * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_GNU]: 
+       * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_GNU]:
        Define MMAP_FIXED.
-       * sysdeps/unix/sysv/linux/hppa/bits/fcntl.h [__USE_GNU]: 
+       * sysdeps/unix/sysv/linux/hppa/bits/fcntl.h [__USE_GNU]:
        Define SYNC_FILE_RANGE_WAIT_BEFORE, SYNC_FILE_RANGE_WRITE,
        SYNC_FILE_RANGE_WAIT_AFTER, sync_file_range, splice, tee.
 

diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h b/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h
index 7e27966..ee91dbf 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h
+++ b/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -25,8 +25,6 @@
 #include <sched.h>
 #include <time.h>
 
-#define __need_sigset_t
-#include <signal.h>
 #include <bits/pthreadtypes.h>
 #include <bits/setjmp.h>
 #include <bits/wordsize.h>
@@ -49,7 +47,7 @@ enum
   PTHREAD_MUTEX_RECURSIVE_NP,
   PTHREAD_MUTEX_ERRORCHECK_NP,
   PTHREAD_MUTEX_ADAPTIVE_NP
-#ifdef __USE_UNIX98
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
   ,
   PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_TIMED_NP,
   PTHREAD_MUTEX_RECURSIVE = PTHREAD_MUTEX_RECURSIVE_NP,
@@ -427,6 +425,18 @@ extern int pthread_setschedprio (pthread_t __target_thread, int __prio)
      __THROW;
 
 
+#ifdef __USE_GNU
+/* Get thread name visible in the kernel and its interfaces.  */
+extern int pthread_getname_np (pthread_t __target_thread, char *__buf,
+                              size_t __buflen)
+     __THROW __nonnull ((2));
+
+/* Set thread name visible in the kernel and its interfaces.  */
+extern int pthread_setname_np (pthread_t __target_thread, __const char *__name)
+     __THROW __nonnull ((2));
+#endif
+
+
 #ifdef __USE_UNIX98
 /* Determine level of concurrency.  */
 extern int pthread_getconcurrency (void) __THROW;
@@ -739,8 +749,8 @@ extern int pthread_mutex_lock (pthread_mutex_t *__mutex)
 #ifdef __USE_XOPEN2K
 /* Wait until lock becomes available, or specified time passes. */
 extern int pthread_mutex_timedlock (pthread_mutex_t *__restrict __mutex,
-                                    __const struct timespec *__restrict
-                                    __abstime) __THROW __nonnull ((1, 2));
+                                   __const struct timespec *__restrict
+                                   __abstime) __THROW __nonnull ((1, 2));
 #endif
 
 /* Unlock a mutex.  */
@@ -748,7 +758,6 @@ extern int pthread_mutex_unlock (pthread_mutex_t *__mutex)
      __THROW __nonnull ((1));
 
 
-#ifdef __USE_UNIX98
 /* Get the priority ceiling of MUTEX.  */
 extern int pthread_mutex_getprioceiling (__const pthread_mutex_t *
                                         __restrict __mutex,
@@ -761,12 +770,11 @@ extern int pthread_mutex_setprioceiling (pthread_mutex_t *__restrict __mutex,
                                         int __prioceiling,
                                         int *__restrict __old_ceiling)
      __THROW __nonnull ((1, 3));
-#endif
 
 
 #ifdef __USE_XOPEN2K8
 /* Declare the state protected by MUTEX as consistent.  */
-extern int pthread_mutex_consistent_np (pthread_mutex_t *__mutex)
+extern int pthread_mutex_consistent (pthread_mutex_t *__mutex)
      __THROW __nonnull ((1));
 # ifdef __USE_GNU
 extern int pthread_mutex_consistent_np (pthread_mutex_t *__mutex)
@@ -797,7 +805,7 @@ extern int pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr,
                                         int __pshared)
      __THROW __nonnull ((1));
 
-#ifdef __USE_UNIX98
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 /* Return in *KIND the mutex kind attribute in *ATTR.  */
 extern int pthread_mutexattr_gettype (__const pthread_mutexattr_t *__restrict
                                      __attr, int *__restrict __kind)
@@ -808,6 +816,7 @@ extern int pthread_mutexattr_gettype (__const pthread_mutexattr_t *__restrict
    PTHREAD_MUTEX_DEFAULT).  */
 extern int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind)
      __THROW __nonnull ((1));
+#endif
 
 /* Return in *PROTOCOL the mutex protocol attribute in *ATTR.  */
 extern int pthread_mutexattr_getprotocol (__const pthread_mutexattr_t *
@@ -831,7 +840,6 @@ extern int pthread_mutexattr_getprioceiling (__const pthread_mutexattr_t *
 extern int pthread_mutexattr_setprioceiling (pthread_mutexattr_t *__attr,
                                             int __prioceiling)
      __THROW __nonnull ((1));
-#endif
 
 #ifdef __USE_XOPEN2K
 /* Get the robustness flag of the mutex attribute ATTR.  */
@@ -990,13 +998,13 @@ extern int pthread_condattr_destroy (pthread_condattr_t *__attr)
 
 /* Get the process-shared flag of the condition variable attribute ATTR.  */
 extern int pthread_condattr_getpshared (__const pthread_condattr_t *
-                                        __restrict __attr,
-                                        int *__restrict __pshared)
+                                       __restrict __attr,
+                                       int *__restrict __pshared)
      __THROW __nonnull ((1, 2));
 
 /* Set the process-shared flag of the condition variable attribute ATTR.  */
 extern int pthread_condattr_setpshared (pthread_condattr_t *__attr,
-                                        int __pshared) __THROW __nonnull ((1));
+                                       int __pshared) __THROW __nonnull ((1));
 
 #ifdef __USE_XOPEN2K
 /* Get the clock selected for the conditon variable attribute ATTR.  */
@@ -1071,7 +1079,7 @@ extern int pthread_barrierattr_getpshared (__const pthread_barrierattr_t *
 
 /* Set the process-shared flag of the barrier attribute ATTR.  */
 extern int pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr,
-                                           int __pshared)
+                                          int __pshared)
      __THROW __nonnull ((1));
 #endif
 
@@ -1136,11 +1144,11 @@ __END_DECLS
 
 #endif /* pthread.h */
 
-#ifndef _PTHREAD_H_HPPA_ 
+#ifndef _PTHREAD_H_HPPA_
 #define _PTHREAD_H_HPPA_ 1
 
 /* The pthread_cond_t initializer is compatible only with NPTL. We do not
-   want to be forwards compatible, we eventually want to drop the code 
+   want to be forwards compatible, we eventually want to drop the code
    that has to clear the old LT initializer.  */
 #undef PTHREAD_COND_INITIALIZER
 #define PTHREAD_COND_INITIALIZER { { 0, 0, 0, (void *) 0, 0, 0, 0, 0, 0 } }
@@ -1173,6 +1181,5 @@ __END_DECLS
   { { { 0, 0, 0, 0 }, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,\
       0, 0, 0 } }
 #endif  /* Unix98 or XOpen2K */
- 
-#endif
 
+#endif