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.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index ac281b8d358dd7d7ae4fb52d19ff65da5a5af6e5..882c478aa4b21653d9396846440453ce6d936d60 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/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

diff --git a/linuxthreads/sysdeps/powerpc/tcb-offsets.sym b/linuxthreads/sysdeps/powerpc/tcb-offsets.sym
index bb4226fb3ad50eed1aca43be6504bd416cebe8fd..b96a79c01a90b0c50bd3f35ef674aab3780dc293 100644 (file)
--- a/linuxthreads/sysdeps/powerpc/tcb-offsets.sym
+++ b/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

diff --git a/linuxthreads/sysdeps/powerpc/tls.h b/linuxthreads/sysdeps/powerpc/tls.h
index 9bae084a0bc7980cf41e4aabd7e34991f0ddd556..de651eb8d2747f40446a96cb277e7061e3171a24 100644 (file)
--- a/linuxthreads/sysdeps/powerpc/tls.h
+++ b/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>

diff --git a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
index 387229a4667ef973f14bdb99acff7585d12042d7..e789d47b9d1f333aad1cb037e441a35e3822e0c0 100644 (file)
--- a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
+++ b/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