From 3b7ed8712599efbecd92f4d68398fb7a593aef75 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 28 Dec 2002 22:19:04 +0000 Subject: Update. 2002-12-28 Ulrich Drepper * misc/sys/cdefs.h (__attribute_deprecated__): New #define. --- linuxthreads/sysdeps/i386/Makefile | 4 ++ linuxthreads/sysdeps/i386/tcb-offsets.sym | 7 +++ linuxthreads/sysdeps/i386/tls.h | 6 +-- linuxthreads/sysdeps/ia64/Makefile | 3 ++ linuxthreads/sysdeps/ia64/tcb-offsets.sym | 4 ++ linuxthreads/sysdeps/ia64/tls.h | 3 ++ linuxthreads/sysdeps/pthread/tcb-offsets.h | 1 + linuxthreads/sysdeps/sparc/Makefile | 3 ++ linuxthreads/sysdeps/sparc/sparc32/tls.h | 61 --------------------- linuxthreads/sysdeps/sparc/sparc64/tls.h | 61 --------------------- linuxthreads/sysdeps/sparc/tcb-offsets.sym | 4 ++ linuxthreads/sysdeps/sparc/tls.h | 63 ++++++++++++++++++++++ .../sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 8 +-- .../sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h | 2 - .../unix/sysv/linux/sparc/sparc32/sysdep-cancel.h | 2 - .../unix/sysv/linux/sparc/sparc64/sysdep-cancel.h | 2 - 16 files changed, 96 insertions(+), 138 deletions(-) create mode 100644 linuxthreads/sysdeps/i386/tcb-offsets.sym create mode 100644 linuxthreads/sysdeps/ia64/Makefile create mode 100644 linuxthreads/sysdeps/ia64/tcb-offsets.sym create mode 100644 linuxthreads/sysdeps/pthread/tcb-offsets.h create mode 100644 linuxthreads/sysdeps/sparc/Makefile delete mode 100644 linuxthreads/sysdeps/sparc/sparc32/tls.h delete mode 100644 linuxthreads/sysdeps/sparc/sparc64/tls.h create mode 100644 linuxthreads/sysdeps/sparc/tcb-offsets.sym create mode 100644 linuxthreads/sysdeps/sparc/tls.h (limited to 'linuxthreads/sysdeps') 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 +#include + +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 #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 +#include + +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 #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/sparc32/tls.h b/linuxthreads/sysdeps/sparc/sparc32/tls.h deleted file mode 100644 index 1b316d0b33..0000000000 --- a/linuxthreads/sysdeps/sparc/sparc32/tls.h +++ /dev/null @@ -1,61 +0,0 @@ -/* Definitions for thread-local data handling. linuxthreads/sparc32 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 -# include - -/* 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/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 -# include - -/* 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 +#include + +MULTIPLE_THREADS_OFFSET offsetof (tcbhead_t, multiple_threads) diff --git a/linuxthreads/sysdeps/sparc/tls.h b/linuxthreads/sysdeps/sparc/tls.h new file mode 100644 index 0000000000..4571922f57 --- /dev/null +++ b/linuxthreads/sysdeps/sparc/tls.h @@ -0,0 +1,63 @@ +/* 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. + + 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 +# include + +/* 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; + +#else /* __ASSEMBLER__ */ +# include +#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/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 #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 #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 #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 #endif -#define MULTIPLE_THREADS_OFFSET 40 - #if !defined NOT_IN_libc || defined IS_IN_libpthread # undef PSEUDO -- cgit v1.2.3