diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-12-17 23:04:50 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-12-17 23:04:50 +0000 |
| commit | 0278652840d0b09297986baee97ab46c136f304c (patch) | |
| tree | d6c2bb1b11d66043dcae74e021ef4d8a29a233b3 | |
| parent | c70f81dd2ce638c807bb633acc551a68c02c99cb (diff) | |
| download | glibc-0278652840d0b09297986baee97ab46c136f304c.tar.gz glibc-0278652840d0b09297986baee97ab46c136f304c.tar.xz glibc-0278652840d0b09297986baee97ab46c136f304c.zip | |
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.
| -rw-r--r-- | linuxthreads/ChangeLog | 9 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/powerpc/tcb-offsets.sym | 6 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/powerpc/tls.h | 4 | ||||
| -rw-r--r-- | linuxthreads/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 ac281b8d35..882c478aa4 100644 --- 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 bb4226fb3a..b96a79c01a 100644 --- 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 9bae084a0b..de651eb8d2 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 <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 387229a466..e789d47b9d 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 <sysdep.h> +#include <tls.h> #ifndef __ASSEMBLER__ # include <linuxthreads/internals.h> #endif |