2007-11-20 Neal H. Walfield <neal@gnu.org>

	Merge changes from mainline Hurd.  Update L4 bits to compile with
	those changes.

	* sysdeps/l4/pt-block.c (__pthread_block): Call l4_receive, not
	L4_Receive.
	* sysdeps/l4/pt-create-np.c (pthread_create_from_l4_tid_np): Don't
	pass TID to __pthread_create_internal.  Emit a warning.
	* sysdeps/l4/pt-stack-alloc.c (allocate_page): Remove function.
	(__pthread_stack_alloc): Don't require that STACKSIZE is equal to
	__pthread_stacksize.  Call mmap.
	* sysdeps/l4/pt-thread-halt.c (__pthread_thread_halt): Take
	additional argument, need_dealloc.  Call __pthread_dealloc.  Stop
	the thread.
	* sysdeps/l4/hurd/pt-sysdep.c (init_routine): When calling
	__pthread_create_internal, don't pass the tid.
	* tests/test-1.c (main): Use pthread_mutex_init, not
	PTHREAD_MUTEX_INITIALIZER.

	* pthread/pt-alloc.c: Don't include <bits/atomic.h>.  Include
	<atomic.h>.
	(__pthread_free_threads): Make it an atomicptr_t, not an
	__atomicptr_t.
	(__pthread_alloc): Don't use __atomicptr_compare_and_swap, use
	atomic_compare_and_exchange_val_acq.
	* pthread/pt-create.c: Don't include <bits/atomic.h>.  Include
	<atomic.h>.
	(__pthread_total): Make it an atomic_fast32_t, not an __atomic_t.
	(__pthread_create_internal): Use atomic_increment and
	atomic_decrement, not __atomic_inc and __atomic_dec.
	* pthread/pt-dealloc.c: Don't include <bits/atomic.h>.  Include
	<atomic.h>.
	(__pthread_free_threads): Make it an atomicptr_t, not an
	__atomicptr_t.
	(__pthread_dealloc): Use atomic_compare_and_exchange_val_acq, not
	__atomicptr_compare_and_swap.
	* pthread/pt-exit.c: Don't include <bits/atomic.h>.  Include
	<atomic.h>.
	(pthread_exit): Use atomic_decrement_and_test, not
	__atomic_dec_and_test.
	* pthread/pt-internal.h: Don't include <bits/atomic.h>.  Include
	<atomic.h>.
	(__pthread_total): Make it an atomic_fast32_t, not an __atomic_t.
	* sysdeps/powerpc/bits/atomic.h: Remove file.
	* sysdeps/ia32/bits/atomic.h: Likewise.

1 files changed, 16 insertions, 12 deletions

diff --git a/pthread/pt-alloc.c b/pthread/pt-alloc.c
index 615b728..6cf9106 100644
--- a/pthread/pt-alloc.c
+++ b/pthread/pt-alloc.c
@@ -1,5 +1,5 @@
 /* Allocate a new thread structure.
-   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2005, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -46,7 +46,7 @@ pthread_rwlock_t __pthread_threads_lock;
 
 
 /* List of thread structures corresponding to free thread IDs.  */
-uatomicptr_t __pthread_free_threads;
+atomicptr_t __pthread_free_threads;
 
 static inline error_t
 initialize_pthread (struct __pthread *new, int recycling)
@@ -69,8 +69,8 @@ initialize_pthread (struct __pthread *new, int recycling)
 
   new->stack = 0;
 
-  new->state_lock = (struct __pthread_mutex) PTHREAD_MUTEX_INITIALIZER;
-  new->state_cond = (struct __pthread_cond) PTHREAD_COND_INITIALIZER;
+  new->state_lock = (pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER;
+  new->state_cond = (pthread_cond_t) PTHREAD_COND_INITIALIZER;
 
   new->cancelation_handlers = 0;
 
@@ -98,7 +98,9 @@ __pthread_alloc (struct __pthread **pthread)
   while ((new = (struct __pthread *)__pthread_free_threads))
     {
       if (atomic_compare_and_exchange_val_acq (&__pthread_free_threads,
-					       new, new->next))
+					       (uintptr_t) new->next,
+					       (uintptr_t) new)
+	  == (uintptr_t) new)
 	{
 	  /* Yes, we managed to get one.  The thread number in the
              thread structure still refers to the correct slot.  */
@@ -111,7 +113,9 @@ __pthread_alloc (struct __pthread **pthread)
 	      {
 		new->next = (struct __pthread *)__pthread_free_threads;
 		if (atomic_compare_and_exchange_val_acq
-		    (&__pthread_free_threads, new->next, new))
+		    (&__pthread_free_threads,
+		     (uintptr_t) new, (uintptr_t) new->next)
+		    == (uintptr_t) new->next)
 		  break;
 	      }
 
@@ -139,10 +143,10 @@ __pthread_alloc (struct __pthread **pthread)
 
   if (__pthread_num_threads < __pthread_max_threads)
     {
-      /* We have a free slot.  Use the slot number as
-         the thread ID for the new thread.  */
-      new->thread = __pthread_num_threads++;
-      __pthread_threads[new->thread] = NULL;
+      /* We have a free slot.  Use the slot number plus one as the
+         thread ID for the new thread.  */
+      new->thread = 1 + __pthread_num_threads++;
+      __pthread_threads[new->thread - 1] = NULL;
 
       pthread_rwlock_unlock (&__pthread_threads_lock);
 
@@ -203,8 +207,8 @@ __pthread_alloc (struct __pthread **pthread)
   __pthread_threads = threads;
 
   /* And allocate ourselves one of the newly created slots.  */
-  new->thread = __pthread_num_threads++;
-  __pthread_threads[new->thread] = NULL;
+  new->thread = 1 + __pthread_num_threads++;
+  __pthread_threads[new->thread - 1] = NULL;
 
   pthread_rwlock_unlock (&__pthread_threads_lock);