* sysdeps/alpha/tcb-offsets.sym (thread_offsetof): Redefine to make...

2004-10-14  Richard Henderson  <rth@redhat.com>

	* sysdeps/alpha/tcb-offsets.sym (thread_offsetof): Redefine to
	make gcc4 happy.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 68e643f282396f8a429bab944f0e40885b2f2a3e..6c47e4400de184672e4b63558900d5c5b56c6ca9 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-14  Richard Henderson  <rth@redhat.com>
+
+       * sysdeps/alpha/tcb-offsets.sym (thread_offsetof): Redefine to
+       make gcc4 happy.
+
 2004-10-06  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/unix/sysv/linux/jmp-unwind.c: Include pthreadP.h instead

diff --git a/nptl/sysdeps/alpha/tcb-offsets.sym b/nptl/sysdeps/alpha/tcb-offsets.sym
index 14494ee2cdb2a30323ad3ddbeb55939a3574efbf..ebd84f35e53fe0ecdd938b1e667d57f38b65ad4c 100644 (file)
--- a/nptl/sysdeps/alpha/tcb-offsets.sym
+++ b/nptl/sysdeps/alpha/tcb-offsets.sym
@@ -4,8 +4,10 @@
 --
 
 -- Abuse tls.h macros to derive offsets relative to the thread register.
-# define __builtin_thread_pointer()  ((void *) 0)
-# define thread_offsetof(mem)       ((void *) &THREAD_SELF->mem - (void *) 0)
+-- # define __builtin_thread_pointer()  ((void *) 0)
+-- # define thread_offsetof(mem)     ((void *) &THREAD_SELF->mem - (void *) 0)
+-- Ho hum, this doesn't work in gcc4, so Know Things about THREAD_SELF
+#define thread_offsetof(mem)   (long)(offsetof(struct pthread, mem) - sizeof(struct pthread))
 
 MULTIPLE_THREADS_OFFSET                thread_offsetof (header.multiple_threads)
 PID_OFFSET                     thread_offsetof (pid)