diff options
Diffstat (limited to 'linuxthreads')
19 files changed, 71 insertions, 93 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 3c50230de0..15a0974034 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,36 @@ +2002-12-28 Jakub Jelinek <jakub@redhat.com> + + * libc_pthread_init.c (__libc_pthread_init): Remove + MULTIPLE_THREADS_OFFSET check. + * sysdeps/i386/tls.h: Include tcb-offsets.h in assembler. + (SYSINFO_OFFSET): Remove. + * sysdeps/i386/Makefile [csu] (gen-as-const-headers): Add + tcb-offsets.sym. + * sysdeps/i386/tcb-offsets.sym: New file. + * sysdeps/pthread/tcb-offsets.h: New file. + * sysdeps/sparc/sparc32/tls.h: Removed. + * sysdeps/sparc/sparc64/tls.h: Move... + * sysdeps/sparc/tls.h: ...here. Include tcb-offsets.h in assembler. + * sysdeps/sparc/Makefile: New file. + * sysdeps/sparc/tcb-offsets.sym: New file. + * sysdeps/ia64/tls.h: Include tcb-offsets.h in assembler. + * sysdeps/ia64/Makefile: New file. + * sysdeps/ia64/tcb-offsets.sym: New file. + * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h + (MULTIPLE_THREADS_OFFSET): Remove. + Replace defined MULTIPLE_THREADS_OFFSET + with defined FLOATING_STACKS && USE___THREAD. + * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h + (MULTIPLE_THREADS_OFFSET): Remove. + * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h + (MULTIPLE_THREADS_OFFSET): Remove. + * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h + (MULTIPLE_THREADS_OFFSET): Remove. + * pthread.c (__pthread_initialize_manager): Remove + MULTIPLE_THREADS_OFFSET cbeck. + + * tst-cancel-wrappers.sh: Add line continuations. + 2002-12-27 Jakub Jelinek <jakub@redhat.com> * sysdeps/pthread/bits/libc-tsd.h: Include linuxthreads/descr.h diff --git a/linuxthreads/libc_pthread_init.c b/linuxthreads/libc_pthread_init.c index c952b22d07..99213a2ff0 100644 --- a/linuxthreads/libc_pthread_init.c +++ b/linuxthreads/libc_pthread_init.c @@ -36,14 +36,6 @@ __libc_pthread_init (functions) sizeof (__libc_pthread_functions)); #endif -#ifdef MULTIPLE_THREADS_OFFSET - /* We have a macro which is used in asm code describing data layout. - Make sure it does not get out of date. */ - if (offsetof (struct _pthread_descr_struct, p_header.data.multiple_threads) - != MULTIPLE_THREADS_OFFSET) - abort (); -#endif - #if !(USE_TLS && HAVE___THREAD) /* Initialize thread-locale current locale to point to the global one. With __thread support, the variable's initializer takes care of this. */ diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index 6bd9de9081..5cc51460a3 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -558,11 +558,6 @@ int __pthread_initialize_manager(void) __pthread_multiple_threads = 1; __pthread_main_thread->p_header.data.multiple_threads = 1; * __libc_multiple_threads_ptr = 1; -#ifdef MULTIPLE_THREADS_OFFSET - if (offsetof(struct _pthread_descr_struct, p_header.data.multiple_threads) - != MULTIPLE_THREADS_OFFSET) - abort (); -#endif #ifndef HAVE_Z_NODELETE if (__builtin_expect (&__dso_handle != NULL, 1)) diff --git a/linuxthreads/sysdeps/i386/Makefile b/linuxthreads/sysdeps/i386/Makefile index d6c3514196..b0051fbdd7 100644 --- a/linuxthreads/sysdeps/i386/Makefile +++ b/linuxthreads/sysdeps/i386/Makefile @@ -16,3 +16,7 @@ CFLAGS-ptlongjmp.c += -fno-omit-frame-pointer CFLAGS-semaphore.c += -fno-omit-frame-pointer CFLAGS-sighandler.c += -fno-omit-frame-pointer endif + +ifeq ($(subdir),csu) +gen-as-const-headers += tcb-offsets.sym +endif diff --git a/linuxthreads/sysdeps/i386/tcb-offsets.sym b/linuxthreads/sysdeps/i386/tcb-offsets.sym new file mode 100644 index 0000000000..69a5018d88 --- /dev/null +++ b/linuxthreads/sysdeps/i386/tcb-offsets.sym @@ -0,0 +1,7 @@ +#include <sysdep.h> +#include <tls.h> + +MULTIPLE_THREADS_OFFSET offsetof (tcbhead_t, multiple_threads) +#ifdef NEED_DL_SYSINFO +SYSINFO_OFFSET offsetof (tcbhead_t, sysinfo) +#endif diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h index 761a8ca943..216ba554f6 100644 --- a/linuxthreads/sysdeps/i386/tls.h +++ b/linuxthreads/sysdeps/i386/tls.h @@ -46,11 +46,9 @@ typedef struct uintptr_t sysinfo; #endif } tcbhead_t; -#endif -#ifdef NEED_DL_SYSINFO -/* Offset of the SYSINFO element in tcbhead_t. */ -# define SYSINFO_OFFSET 24 +#else /* __ASSEMBLER__ */ +# include <tcb-offsets.h> #endif /* We can support TLS only if the floating-stack support is available. diff --git a/linuxthreads/sysdeps/ia64/Makefile b/linuxthreads/sysdeps/ia64/Makefile new file mode 100644 index 0000000000..81bddf688c --- /dev/null +++ b/linuxthreads/sysdeps/ia64/Makefile @@ -0,0 +1,3 @@ +ifeq ($(subdir),csu) +gen-as-const-headers += tcb-offsets.sym +endif diff --git a/linuxthreads/sysdeps/ia64/tcb-offsets.sym b/linuxthreads/sysdeps/ia64/tcb-offsets.sym new file mode 100644 index 0000000000..aee6be2570 --- /dev/null +++ b/linuxthreads/sysdeps/ia64/tcb-offsets.sym @@ -0,0 +1,4 @@ +#include <sysdep.h> +#include <tls.h> + +MULTIPLE_THREADS_OFFSET offsetof (tcbhead_t, multiple_threads) diff --git a/linuxthreads/sysdeps/ia64/tls.h b/linuxthreads/sysdeps/ia64/tls.h index c270795254..544da6e694 100644 --- a/linuxthreads/sysdeps/ia64/tls.h +++ b/linuxthreads/sysdeps/ia64/tls.h @@ -44,6 +44,9 @@ typedef struct void *self; /* Pointer to the thread descriptor. */ int multiple_threads; } tcbhead_t; + +#else /* __ASSEMBLER__ */ +# include <tcb-offsets.h> #endif /* __ASSEMBLER__ */ #undef USE_TLS diff --git a/linuxthreads/sysdeps/pthread/tcb-offsets.h b/linuxthreads/sysdeps/pthread/tcb-offsets.h new file mode 100644 index 0000000000..3fe13702ea --- /dev/null +++ b/linuxthreads/sysdeps/pthread/tcb-offsets.h @@ -0,0 +1 @@ +/* This is overridden by generated tcb-offsets.h on arches which need it. */ diff --git a/linuxthreads/sysdeps/sparc/Makefile b/linuxthreads/sysdeps/sparc/Makefile new file mode 100644 index 0000000000..81bddf688c --- /dev/null +++ b/linuxthreads/sysdeps/sparc/Makefile @@ -0,0 +1,3 @@ +ifeq ($(subdir),csu) +gen-as-const-headers += tcb-offsets.sym +endif diff --git a/linuxthreads/sysdeps/sparc/sparc64/tls.h b/linuxthreads/sysdeps/sparc/sparc64/tls.h deleted file mode 100644 index 039ad2bc48..0000000000 --- a/linuxthreads/sysdeps/sparc/sparc64/tls.h +++ /dev/null @@ -1,61 +0,0 @@ -/* Definitions for thread-local data handling. linuxthreads/sparc64 version. - Copyright (C) 2002 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#ifndef _TLS_H -#define _TLS_H - -#ifndef __ASSEMBLER__ - -# include <pt-machine.h> -# include <stddef.h> - -/* Type for the dtv. */ -typedef union dtv -{ - size_t counter; - void *pointer; -} dtv_t; - -typedef struct -{ - void *tcb; /* Pointer to the TCB. Not necessary the - thread descriptor used by libpthread. */ - dtv_t *dtv; - void *self; /* Pointer to the thread descriptor. */ - int multiple_threads; -} tcbhead_t; - -#endif /* __ASSEMBLER__ */ - -#undef USE_TLS - -#if USE_TLS - -#else - -#define NONTLS_INIT_TP \ - do { \ - static const tcbhead_t nontls_init_tp \ - = { .multiple_threads = 0 }; \ - __thread_self = (__typeof (__thread_self)) &nontls_init_tp; \ - } while (0) - -#endif /* USE_TLS */ - -#endif /* tls.h */ diff --git a/linuxthreads/sysdeps/sparc/tcb-offsets.sym b/linuxthreads/sysdeps/sparc/tcb-offsets.sym new file mode 100644 index 0000000000..aee6be2570 --- /dev/null +++ b/linuxthreads/sysdeps/sparc/tcb-offsets.sym @@ -0,0 +1,4 @@ +#include <sysdep.h> +#include <tls.h> + +MULTIPLE_THREADS_OFFSET offsetof (tcbhead_t, multiple_threads) diff --git a/linuxthreads/sysdeps/sparc/sparc32/tls.h b/linuxthreads/sysdeps/sparc/tls.h index 1b316d0b33..4571922f57 100644 --- a/linuxthreads/sysdeps/sparc/sparc32/tls.h +++ b/linuxthreads/sysdeps/sparc/tls.h @@ -1,4 +1,4 @@ -/* Definitions for thread-local data handling. linuxthreads/sparc32 version. +/* Definitions for thread-local data handling. linuxthreads/sparc version. Copyright (C) 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -41,6 +41,8 @@ typedef struct int multiple_threads; } tcbhead_t; +#else /* __ASSEMBLER__ */ +# include <tcb-offsets.h> #endif /* __ASSEMBLER__ */ #undef USE_TLS diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index d449527900..c2455a7464 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -24,10 +24,6 @@ # include <linuxthreads/internals.h> #endif -#if defined FLOATING_STACKS && USE___THREAD -# define MULTIPLE_THREADS_OFFSET 20 -#endif - #if !defined NOT_IN_libc || defined IS_IN_libpthread # undef PSEUDO @@ -88,7 +84,7 @@ #endif # ifndef ASSEMBLER -# if defined MULTIPLE_THREADS_OFFSET && defined PIC +# if defined FLOATING_STACKS && USE___THREAD && defined PIC # define SINGLE_THREAD_P \ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ p_header.data.multiple_threads) == 0, 1) @@ -99,7 +95,7 @@ extern int __local_multiple_threads attribute_hidden; # else # if !defined PIC # define SINGLE_THREAD_P cmpl $0, __local_multiple_threads -# elif defined MULTIPLE_THREADS_OFFSET +# elif defined FLOATING_STACKS && USE___THREAD # define SINGLE_THREAD_P cmpl $0, %gs:MULTIPLE_THREADS_OFFSET # else # if !defined HAVE_HIDDEN || !USE___THREAD diff --git a/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h index d74c044981..723c2e4117 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h @@ -23,8 +23,6 @@ # include <linuxthreads/internals.h> #endif -#define MULTIPLE_THREADS_OFFSET 40 - #if !defined NOT_IN_libc || defined IS_IN_libpthread # undef PSEUDO diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h index ff03f631e3..f6afb81373 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h @@ -23,8 +23,6 @@ # include <linuxthreads/internals.h> #endif -#define MULTIPLE_THREADS_OFFSET 20 - #if !defined NOT_IN_libc || defined IS_IN_libpthread # undef PSEUDO diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h index 8b9585d2d7..d236bf33b7 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h @@ -23,8 +23,6 @@ # include <linuxthreads/internals.h> #endif -#define MULTIPLE_THREADS_OFFSET 40 - #if !defined NOT_IN_libc || defined IS_IN_libpthread # undef PSEUDO diff --git a/linuxthreads/tst-cancel-wrappers.sh b/linuxthreads/tst-cancel-wrappers.sh index 364b4729dc..2de0238cfa 100644 --- a/linuxthreads/tst-cancel-wrappers.sh +++ b/linuxthreads/tst-cancel-wrappers.sh @@ -70,8 +70,8 @@ C["__xpg_sigpause"]=1 # signals.c in linuxthreads does the cancellation checks not using # *_{enable,disable}_asynccancel. # Similarly pt-system.o* is allowed to call __libc_system directly. - if ((!seen_enable || !seen_disable) - && !(object ~ /^signals.o/) + if ((!seen_enable || !seen_disable) \ + && !(object ~ /^signals.o/) \ && !(object ~ /^pt-system.o/)) { printf "in '$1'(%s) %s'\''s cancellation missing\n", object, seen |