Update.

	* pthread.c (__pthread_initialize_manager): Subtract
	TLS_PRE_TCB_SIZE bytes from tcbp to get to descr.
	* manager.c (pthread_handle_create): Subtract or add TLS_PRE_TCB_SIZE
	instead of sizeof (pthread_descr).
	(pthread_free): Add TLS_PRE_TCB_SIZE instead of sizeof (pthread_descr).
	* sysdeps/powerpc/tls.h (TLS_INIT_TCB_SIZE, TLS_TCB_SIZE): Define to 0.

12 files changed, 30 insertions, 51 deletions

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 8e76d9e..d88e60a 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,12 +1,9 @@
 2003-04-22  Jakub Jelinek  <jakub@redhat.com>
 
-	* descr.h (p_multiple_threads): Define.
-	(struct pthread) [TLS_MULTIPLE_THREADS_IN_TCB]: Move
-	multiple_threads to last int in the structure.
 	* allocatestack.c (TLS_TPADJ): Add TLS_PRE_TCB_SIZE instead of
 	sizeof (struct pthread).
 	(allocate_stack): Subtract TLS_PRE_TCB_SIZE bytes instead of
-	1 struct pthread.  Use p_multiple_threads macro.
+	1 struct pthread.
 	* sysdeps/pthread/createthread.c (create_thread): Use
 	p_multiple_threads macro if TLS_DTV_AT_TP.
 	* sysdeps/powerpc/tls.h (TLS_INIT_TCB_SIZE, TLS_TCB_SIZE): Define
@@ -20,21 +17,8 @@
 	(TLS_INIT_TP, THREAD_SELF, INIT_THREAD_SELF): Don't add TLS_TCB_SIZE
 	unneccessarily.
 	(NO_TLS_OFFSET): Define.
-	* sysdeps/powerpc/tcb-offsets.sym (MULTIPLE_THREADS): Use
-	p_multiple_threads macro.
-	* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
-	(SINGLE_THREAD_P): Likewise.
-	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
-	(SINGLE_THREAD_P): Likewise.
 	* sysdeps/unix/sysv/linux/powerpc/createthread.c (TLS_VALUE): Don't
 	add TLS_TCB_SIZE unnecessarily.
-	* sysdeps/ia64/tcb-offsets.sym (MULTIPLE_THREADS): Define to
-	-sizeof(int).
-	* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (SINGLE_THREAD_P):
-	Use p_multiple_threads macro.
-	* sysdeps/sh/tcb-offsets.sym (MULTIPLE_THREADS): Likewise.
-	* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (SINGLE_THREAD_P):
-	Likewise.
 
 2003-04-22  Roland McGrath  <roland@redhat.com>
 
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index c6b89d8..680f365 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -322,7 +322,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
 
 #ifdef TLS_MULTIPLE_THREADS_IN_TCB
       /* This is at least the second thread.  */
-      p_multiple_threads (pd) = 1;
+      pd->header.multiple_threads = 1;
 #else
       __pthread_multiple_threads = *__libc_multiple_threads_ptr = 1;
 #endif
@@ -449,7 +449,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
 
 #ifdef TLS_MULTIPLE_THREADS_IN_TCB
 	  /* This is at least the second thread.  */
-	  p_multiple_threads (pd) = 1;
+	  pd->header.multiple_threads = 1;
 #else
 	  __pthread_multiple_threads = *__libc_multiple_threads_ptr = 1;
 #endif
diff --git a/nptl/descr.h b/nptl/descr.h
index 7fd64ec..efb25c7 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -99,7 +99,11 @@ struct pthread
 #if !TLS_DTV_AT_TP
     /* This overlaps the TCB as used for TLS without threads (see tls.h).  */
     tcbhead_t header;
-# define p_multiple_threads(descr) (descr)->header.multiple_threads
+#elif TLS_MULTIPLE_THREADS_IN_TCB
+    struct
+    {
+      int multiple_threads;
+    } header;
 #endif
 
     /* This extra padding has no special purpose, and this structure layout
@@ -228,21 +232,6 @@ struct pthread
   size_t stackblock_size;
   /* Size of the included guard area.  */
   size_t guardsize;
-
-#if TLS_DTV_AT_TP && TLS_MULTIPLE_THREADS_IN_TCB
-  /* Must come last.  */
-  int __multiple_threads;
-# define p_multiple_threads(descr) \
-  ((union							\
-    {								\
-      struct pthread s;						\
-      struct							\
-	{							\
-	  char dummy[sizeof (struct pthread) - sizeof (int)];   \
-	  int multiple_threads;					\
-	} m;							\
-    } *)(descr)->m.multiple_threads)
-#endif
 } __attribute ((aligned (TCB_ALIGNMENT)));
 
 
diff --git a/nptl/sysdeps/ia64/tcb-offsets.sym b/nptl/sysdeps/ia64/tcb-offsets.sym
index 9f92bb6..11cc06a 100644
--- a/nptl/sysdeps/ia64/tcb-offsets.sym
+++ b/nptl/sysdeps/ia64/tcb-offsets.sym
@@ -1,4 +1,4 @@
 #include <sysdep.h>
 #include <tls.h>
 
-MULTIPLE_THREADS_OFFSET -sizeof(int)
+MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) - sizeof (struct pthread)
diff --git a/nptl/sysdeps/powerpc/tcb-offsets.sym b/nptl/sysdeps/powerpc/tcb-offsets.sym
index 58ee030..d6b7560 100644
--- a/nptl/sysdeps/powerpc/tcb-offsets.sym
+++ b/nptl/sysdeps/powerpc/tcb-offsets.sym
@@ -1,4 +1,13 @@
 #include <sysdep.h>
 #include <tls.h>
 
-MULTIPLE_THREADS_OFFSET	((void *) &p_multiple_threads ((struct pthread) ((void *) 0 - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE)) - (void *) 0)
+--
+
+-- Abuse tls.h macros to derive offsets relative to the thread register.
+# undef __thread_register
+# define __thread_register	((void *) 0)
+# define thread_offsetof(mem)	((void *) &THREAD_SELF->mem - (void *) 0)
+
+#if TLS_MULTIPLE_THREADS_IN_TCB
+MULTIPLE_THREADS_OFFSET		thread_offsetof (header.multiple_threads)
+#endif
diff --git a/nptl/sysdeps/powerpc/tls.h b/nptl/sysdeps/powerpc/tls.h
index e3e0424..6573bb6 100644
--- a/nptl/sysdeps/powerpc/tls.h
+++ b/nptl/sysdeps/powerpc/tls.h
@@ -81,7 +81,9 @@ typedef struct
 # define TLS_TCB_ALIGN		__alignof__ (struct pthread)
 
 /* This is the size we need before TCB.  */
-# define TLS_PRE_TCB_SIZE	(sizeof (struct pthread) + 32)
+# define TLS_PRE_TCB_SIZE \
+  (sizeof (struct pthread)						      \
+   + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1)))
 
 # ifndef __powerpc64__
 /* Register r2 (tp) is reserved by the ABI as "thread pointer". */
diff --git a/nptl/sysdeps/pthread/createthread.c b/nptl/sysdeps/pthread/createthread.c
index f5c6406..9d00e4e 100644
--- a/nptl/sysdeps/pthread/createthread.c
+++ b/nptl/sysdeps/pthread/createthread.c
@@ -87,11 +87,7 @@ create_thread (struct pthread *pd, STACK_VARIABLES_PARMS)
 	     thread might not yet have the flag set.  No need to set
 	     the global variable again if this is what we use.  */
 #ifdef TLS_MULTIPLE_THREADS_IN_TCB
-# if TLS_DTV_AT_TP
-	  p_multiple_threads (THREAD_SELF) = 1;
-# else
 	  THREAD_SETMEM (THREAD_SELF, header.multiple_threads, 1);
-# endif
 #endif
 
 	  /* Now fill in the information about the new thread in
@@ -163,11 +159,7 @@ create_thread (struct pthread *pd, STACK_VARIABLES_PARMS)
      not yet have the flag set.  No need to set the global variable
      again if this is what we use.  */
 #ifdef TLS_MULTIPLE_THREADS_IN_TCB
-# if TLS_DTV_AT_TP
-  p_multiple_threads (THREAD_SELF) = 1;
-# else
   THREAD_SETMEM (THREAD_SELF, header.multiple_threads, 1);
-# endif
 #endif
 
   return 0;
diff --git a/nptl/sysdeps/sh/tcb-offsets.sym b/nptl/sysdeps/sh/tcb-offsets.sym
index 940c933..3386f1d 100644
--- a/nptl/sysdeps/sh/tcb-offsets.sym
+++ b/nptl/sysdeps/sh/tcb-offsets.sym
@@ -1,5 +1,5 @@
 #include <sysdep.h>
 #include <tls.h>
 
-MULTIPLE_THREADS_OFFSET		((char *) &p_multiple_threads ((struct pthread *)0) - (char *) 0)
+MULTIPLE_THREADS_OFFSET		offsetof (struct pthread, header.multiple_threads)
 TLS_PRE_TCB_SIZE		sizeof (struct pthread)
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
index 930cc14..667abce 100644
--- a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
@@ -101,7 +101,7 @@ __syscall_error_##args:							      \
 
 # ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P \
-  __builtin_expect (p_multiple_threads (THREAD_SELF) == 0, 1)
+  __builtin_expect (THREAD_GETMEM (THREAD_SELF, header.multiple_threads) == 0, 1)
 # else
 #  define SINGLE_THREAD_P \
   adds r14 = MULTIPLE_THREADS_OFFSET, r13 ;; ld4 r14 = [r14] ;; cmp4.ne p6, p7 = 0, r14
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
index f82addb..d256f8d 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
@@ -86,7 +86,8 @@
 
 # ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P						\
-  __builtin_expect (p_multiple_threads (THREAD_SELF) == 0, 1)
+  __builtin_expect (THREAD_GETMEM (THREAD_SELF,				\
+				   header.multiple_threads) == 0, 1)
 # else
 #  define SINGLE_THREAD_P						\
   lwz 10,MULTIPLE_THREADS_OFFSET(2);					\
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
index 00dc3a2..5483586 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
@@ -86,7 +86,8 @@
 
 # ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P						\
-  __builtin_expect (p_multiple_threads (THREAD_SELF) == 0, 1)
+  __builtin_expect (THREAD_GETMEM (THREAD_SELF,				\
+				   header.multiple_threads) == 0, 1)
 # else
 #   define SINGLE_THREAD_P						\
   lwz   10,MULTIPLE_THREADS_OFFSET(13);				\
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
index 10189a4..16f8ad5 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
@@ -117,7 +117,8 @@
 
 # ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P \
-  __builtin_expect (p_multiple_threads (THREAD_SELF) == 0, 1)
+  __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
+				   header.multiple_threads) == 0, 1)
 # else
 #  define SINGLE_THREAD_P \
 	stc gbr,r0; \