From eec0ca9f259d04db3e0dde1ad1d89fce32f72b8c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 15 Mar 2003 11:44:47 +0000 Subject: [PATCH] * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h (SINGLE_THREAD): Use `header' prefix instead of `header.data'. * sysdeps/sh/tcb-offsets.sym (MULTIPLE_THREADS_OFFSET): Likewise. * sysdeps/sh/tls.h (TLS_MULTIPLE_THREADS_IN_TCB): Define. * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (SINGLE_THREAD_P): Use `header.' prefix. * sysdeps/ia64/tcb-offsets.sym (MULTIPLE_THREADS_OFFSET): Likewise. --- nptl/ChangeLog | 10 ++++++++++ nptl/sysdeps/ia64/tcb-offsets.sym | 2 +- nptl/sysdeps/sh/tcb-offsets.sym | 2 +- nptl/sysdeps/sh/tls.h | 2 ++ nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 34d6686..9f2d556 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,13 @@ +2003-03-15 Jakub Jelinek + + * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h + (SINGLE_THREAD): Use `header' prefix instead of `header.data'. + * sysdeps/sh/tcb-offsets.sym (MULTIPLE_THREADS_OFFSET): Likewise. + * sysdeps/sh/tls.h (TLS_MULTIPLE_THREADS_IN_TCB): Define. + * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (SINGLE_THREAD_P): + Use `header.' prefix. + * sysdeps/ia64/tcb-offsets.sym (MULTIPLE_THREADS_OFFSET): Likewise. + 2003-03-15 Ulrich Drepper * sysdeps/x86_64/pthreaddef.h (CURRENT_STACK_FRAME): Don't use diff --git a/nptl/sysdeps/ia64/tcb-offsets.sym b/nptl/sysdeps/ia64/tcb-offsets.sym index 69b6b39..11cc06a 100644 --- a/nptl/sysdeps/ia64/tcb-offsets.sym +++ b/nptl/sysdeps/ia64/tcb-offsets.sym @@ -1,4 +1,4 @@ #include #include -MULTIPLE_THREADS_OFFSET offsetof (struct pthread, multiple_threads) - sizeof (struct pthread) +MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) - sizeof (struct pthread) diff --git a/nptl/sysdeps/sh/tcb-offsets.sym b/nptl/sysdeps/sh/tcb-offsets.sym index ae14fa0..3386f1d 100644 --- a/nptl/sysdeps/sh/tcb-offsets.sym +++ b/nptl/sysdeps/sh/tcb-offsets.sym @@ -1,5 +1,5 @@ #include #include -MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.data.multiple_threads) +MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) TLS_PRE_TCB_SIZE sizeof (struct pthread) diff --git a/nptl/sysdeps/sh/tls.h b/nptl/sysdeps/sh/tls.h index b92b0b8..9c268d4 100644 --- a/nptl/sysdeps/sh/tls.h +++ b/nptl/sysdeps/sh/tls.h @@ -39,6 +39,8 @@ typedef struct void *private; } tcbhead_t; +# define TLS_MULTIPLE_THREADS_IN_TCB 1 + #else /* __ASSEMBLER__ */ # include #endif /* __ASSEMBLER__ */ diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h index 62c693c..667abce 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h @@ -101,7 +101,7 @@ __syscall_error_##args: \ # ifndef __ASSEMBLER__ # define SINGLE_THREAD_P \ - __builtin_expect (THREAD_GETMEM (THREAD_SELF, multiple_threads) == 0, 1) + __builtin_expect (THREAD_GETMEM (THREAD_SELF, header.multiple_threads) == 0, 1) # else # define SINGLE_THREAD_P \ adds r14 = MULTIPLE_THREADS_OFFSET, r13 ;; ld4 r14 = [r14] ;; cmp4.ne p6, p7 = 0, r14 -- 2.7.4