Update.

2003-12-16  Steven Munroe  <sjmunroe@us.ibm.com>

	* sysdeps/powerpc/tcb-offsets.sym [!__powerpc64__]: Remove
	conditional so MULTIPLE_THREADS_OFFSET is generated for both.
	* sysdeps/powerpc/tls.h [!__powerpc64__]: Remove conditional
	so TLS_MULTIPLE_THREADS_IN_TCB is generated for both.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h:
	Include tls.h.

linuxthreads/ChangeLog

@@ -1,3 +1,12 @@
+2003-12-16  Steven Munroe  <sjmunroe@us.ibm.com>
+
+	* sysdeps/powerpc/tcb-offsets.sym [!__powerpc64__]: Remove
+	conditional so MULTIPLE_THREADS_OFFSET is generated for both.
+	* sysdeps/powerpc/tls.h [!__powerpc64__]: Remove conditional
+	so TLS_MULTIPLE_THREADS_IN_TCB is generated for both.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h:
+	Include tls.h.
+
 2003-12-04  Steven Munroe  <sjmunroe@us.ibm.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h

linuxthreads/sysdeps/powerpc/tcb-offsets.sym

@@ -1,11 +1,6 @@
 #include <sysdep.h>
 #include <tls.h>
 
---
-
--- This could go into powerpc32/ instead and conditionalize #include of it.
-#ifndef __powerpc64__
-
 # ifdef USE_TLS
 
 -- Abuse tls.h macros to derive offsets relative to the thread register.
@@ -21,4 +16,3 @@
 
 MULTIPLE_THREADS_OFFSET		thread_offsetof (multiple_threads)
 
-#endif

linuxthreads/sysdeps/powerpc/tls.h

@@ -119,9 +119,7 @@ typedef struct
 
 /* Make sure we have the p_multiple_threads member in the thread structure.
    See below.  */
-#  ifndef __powerpc64__
-#   define TLS_MULTIPLE_THREADS_IN_TCB 1
-#  endif
+#  define TLS_MULTIPLE_THREADS_IN_TCB 1
 
 /* Get the thread descriptor definition.  */
 #  include <linuxthreads/descr.h>

linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h

@@ -18,6 +18,7 @@
    02111-1307 USA.  */
 
 #include <sysdep.h>
+#include <tls.h>
 #ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif