Updated to fedora-glibc-20041012T1128cvs/fedora-glibc-2_3_3-67

6 files changed, 22 insertions, 6 deletions

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5d488cd1a5..e842302cb8 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -4,9 +4,17 @@
 	of pthread-functions.h and pthreaddef.h.
 	* sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise.
 
+	* sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h (pthread_cond_t):
+	Change __data.__nwaiters from int to unsigned int.
+
+	* tst-clock2.c (do_test): Don't fail if _POSIX_THREAD_CPUTIME == 0 and
+	sysconf (_SC_THREAD_CPUTIME) returns negative value.
+
+	* allocatestack.c (__find_thread_by_id): Move attribute_hidden
+	before return type.
+
 	* sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h.
-	(JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from
-	CFA.
+	(JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from CFA.
 
 2004-10-06  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 242da0a5a1..d4f3188f53 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -772,8 +772,8 @@ __reclaim_stacks (void)
 
 #if HP_TIMING_AVAIL
 /* Find a thread given the thread ID.  */
-struct pthread *
 attribute_hidden
+struct pthread *
 __find_thread_by_id (pid_t tid)
 {
   struct pthread *result = NULL;
diff --git a/nptl/pt-allocrtsig.c b/nptl/pt-allocrtsig.c
index 9481e15f25..347bf139ad 100644
--- a/nptl/pt-allocrtsig.c
+++ b/nptl/pt-allocrtsig.c
@@ -28,7 +28,7 @@ extern int __libc_allocate_rtsig_private (int high);
 
 
 /* We reserve __SIGRTMIN for use as the cancellation signal and
-   __SIGRTMIN+1 to andle setuid et.al.  These signals are used
+   __SIGRTMIN+1 to handle setuid et.al.  These signals are used
    internally.  */
 int
 __libc_current_sigrtmin (void)
diff --git a/nptl/pthread_attr_getstackaddr.c b/nptl/pthread_attr_getstackaddr.c
index e6e25880ab..7656600dd5 100644
--- a/nptl/pthread_attr_getstackaddr.c
+++ b/nptl/pthread_attr_getstackaddr.c
@@ -33,7 +33,7 @@ __pthread_attr_getstackaddr (attr, stackaddr)
   iattr = (struct pthread_attr *) attr;
 
   /* Some code assumes this function to work even if no stack address
-     has been set.  Let them figure it our for themselves what the
+     has been set.  Let them figure it out for themselves what the
      value means.  Simply store the result.  */
   *stackaddr = iattr->stackaddr;
 
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
index 03c2ef8106..92fb08c951 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
@@ -100,7 +100,7 @@ typedef union
     __extension__ unsigned long long int __wakeup_seq;
     __extension__ unsigned long long int __woken_seq;
     void *__mutex;
-    int __nwaiters;
+    unsigned int __nwaiters;
     unsigned int __broadcast_seq;
   } __data;
   char __size[__SIZEOF_PTHREAD_COND_T];
diff --git a/nptl/tst-clock2.c b/nptl/tst-clock2.c
index fd216b2ba1..bca40956e2 100644
--- a/nptl/tst-clock2.c
+++ b/nptl/tst-clock2.c
@@ -58,6 +58,14 @@ do_test (void)
 #if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
 # define N 10
 
+# if _POSIX_THREAD_CPUTIME == 0
+  if (sysconf (_SC_THREAD_CPUTIME) < 0)
+    {
+      puts ("_POSIX_THREAD_CPUTIME option not available");
+      return 0;
+    }
+# endif
+
   if (pthread_barrier_init (&b2, NULL, 2) != 0
       || pthread_barrier_init (&bN, NULL, N + 1) != 0)
     {