From 0278652840d0b09297986baee97ab46c136f304c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 17 Dec 2003 23:04:50 +0000 Subject: Update. 2003-12-16 Steven Munroe * 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 | 9 +++++++++ linuxthreads/sysdeps/powerpc/tcb-offsets.sym | 6 ------ linuxthreads/sysdeps/powerpc/tls.h | 4 +--- .../sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h | 1 + 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index ac281b8..882c478 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,12 @@ +2003-12-16 Steven Munroe + + * 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 * 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 bb4226f..b96a79c 100644 --- a/linuxthreads/sysdeps/powerpc/tcb-offsets.sym +++ b/linuxthreads/sysdeps/powerpc/tcb-offsets.sym @@ -1,11 +1,6 @@ #include #include --- - --- 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 9bae084..de651eb 100644 --- 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 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 387229a..e789d47 100644 --- 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 +#include #ifndef __ASSEMBLER__ # include #endif -- cgit v1.1