This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
[PATCH] Linuxthreads sysdep-cancle changes for PPC64
- From: Steve Munroe <sjmunroe at us dot ibm dot com>
- To: libc-alpha at sources dot redhat dot com, Andreas Jaeger <aj at suse dot de>
- Date: Wed, 17 Dec 2003 11:57:53 -0600
- Subject: [PATCH] Linuxthreads sysdep-cancle changes for PPC64
- Organization: IBM LTC
- Reply-to: sjmunroe at vnet dot ibm dot com
My previous patch missed some files as pointed out by Andreas Jaeger
<http://sources.redhat.com/ml/libc-alpha/2003-12/msg00086.html>. The
attached patch repairs the damage by insuring that the per thread
multithread flag and access macros are defined.
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 -urpPN libc23-cvstip-20031216/linuxthreads/sysdeps/powerpc/tcb-offsets.sym libc23/linuxthreads/sysdeps/powerpc/tcb-offsets.sym
--- libc23-cvstip-20031216/linuxthreads/sysdeps/powerpc/tcb-offsets.sym 2003-04-25 17:03:26.000000000 -0500
+++ libc23/linuxthreads/sysdeps/powerpc/tcb-offsets.sym 2003-12-16 15:46:08.109961000 -0600
@@ -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 -urpPN libc23-cvstip-20031216/linuxthreads/sysdeps/powerpc/tls.h libc23/linuxthreads/sysdeps/powerpc/tls.h
--- libc23-cvstip-20031216/linuxthreads/sysdeps/powerpc/tls.h 2003-04-25 17:29:27.000000000 -0500
+++ libc23/linuxthreads/sysdeps/powerpc/tls.h 2003-12-16 15:46:34.860021496 -0600
@@ -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 -urpPN libc23-cvstip-20031216/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h libc23/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
--- libc23-cvstip-20031216/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h 2003-12-11 16:18:07.000000000 -0600
+++ libc23/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h 2003-12-16 15:46:34.000000000 -0600
@@ -18,6 +18,7 @@
02111-1307 USA. */
#include <sysdep.h>
+#include <tls.h>
#ifndef __ASSEMBLER__
# include <linuxthreads/internals.h>
#endif