From 498a22333b835a598ccaed4656e97a0ec3573665 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 14 Mar 2014 10:44:34 -0700 Subject: Compile with -Wundef. --- nptl/sysdeps/i386/tls.h | 7 ++++--- nptl/sysdeps/powerpc/tls.h | 2 ++ nptl/sysdeps/s390/tls.h | 7 ++++--- nptl/sysdeps/sh/tls.h | 1 + nptl/sysdeps/sparc/tls.h | 7 ++++--- nptl/sysdeps/x86_64/tls.h | 8 ++++---- 6 files changed, 19 insertions(+), 13 deletions(-) (limited to 'nptl') diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h index 9c695c0a14..4183ee82b8 100644 --- a/nptl/sysdeps/i386/tls.h +++ b/nptl/sysdeps/i386/tls.h @@ -104,9 +104,6 @@ union user_desc_init }; -/* Get the thread descriptor definition. */ -# include - /* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t), because NPTL getpid, __libc_alloca_cutoff etc. need (almost) the whole struct pthread even when not linked with -lpthread. */ @@ -124,6 +121,10 @@ union user_desc_init /* The TCB can have any size and the memory following the address the thread pointer points to is unspecified. Allocate the TCB there. */ # define TLS_TCB_AT_TP 1 +# define TLS_DTV_AT_TP 0 + +/* Get the thread descriptor definition. */ +# include /* Install the dtv pointer. The pointer passed is to the element with diff --git a/nptl/sysdeps/powerpc/tls.h b/nptl/sysdeps/powerpc/tls.h index c9baf4d469..556c8d59a5 100644 --- a/nptl/sysdeps/powerpc/tls.h +++ b/nptl/sysdeps/powerpc/tls.h @@ -49,6 +49,7 @@ typedef union dtv /* The TP points to the start of the thread blocks. */ # define TLS_DTV_AT_TP 1 +# define TLS_TCB_AT_TP 0 /* We use the multiple_threads field in the pthread struct */ #define TLS_MULTIPLE_THREADS_IN_TCB 1 @@ -56,6 +57,7 @@ typedef union dtv /* Get the thread descriptor definition. */ # include + /* The stack_guard is accessed directly by GCC -fstack-protector code, so it is a part of public ABI. The dtv and pointer_guard fields are private. */ diff --git a/nptl/sysdeps/s390/tls.h b/nptl/sysdeps/s390/tls.h index d81019e4d3..2019882f2c 100644 --- a/nptl/sysdeps/s390/tls.h +++ b/nptl/sysdeps/s390/tls.h @@ -73,9 +73,6 @@ typedef struct /* Get system call information. */ # include -/* Get the thread descriptor definition. */ -# include - /* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t), because NPTL getpid, __libc_alloca_cutoff etc. need (almost) the whole struct pthread even when not linked with -lpthread. */ @@ -93,6 +90,10 @@ typedef struct /* The TCB can have any size and the memory following the address the thread pointer points to is unspecified. Allocate the TCB there. */ # define TLS_TCB_AT_TP 1 +# define TLS_DTV_AT_TP 0 + +/* Get the thread descriptor definition. */ +# include /* Install the dtv pointer. The pointer passed is to the element with diff --git a/nptl/sysdeps/sh/tls.h b/nptl/sysdeps/sh/tls.h index 59e49f743c..84e464c448 100644 --- a/nptl/sysdeps/sh/tls.h +++ b/nptl/sysdeps/sh/tls.h @@ -76,6 +76,7 @@ typedef struct /* The TLS blocks start right after the TCB. */ # define TLS_DTV_AT_TP 1 +# define TLS_TCB_AT_TP 0 /* Get the thread descriptor definition. */ # include diff --git a/nptl/sysdeps/sparc/tls.h b/nptl/sysdeps/sparc/tls.h index b10c68f34e..755bc23e57 100644 --- a/nptl/sysdeps/sparc/tls.h +++ b/nptl/sysdeps/sparc/tls.h @@ -69,9 +69,6 @@ typedef struct /* Get system call information. */ # include -/* Get the thread descriptor definition. */ -# include - register struct pthread *__thread_self __asm__("%g7"); /* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t), @@ -91,6 +88,10 @@ register struct pthread *__thread_self __asm__("%g7"); /* The TCB can have any size and the memory following the address the thread pointer points to is unspecified. Allocate the TCB there. */ # define TLS_TCB_AT_TP 1 +# define TLS_DTV_AT_TP 0 + +/* Get the thread descriptor definition. */ +# include /* Install the dtv pointer. The pointer passed is to the element with index -1 which contain the length. */ diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h index cbb5e9e5bd..30bd449528 100644 --- a/nptl/sysdeps/x86_64/tls.h +++ b/nptl/sysdeps/x86_64/tls.h @@ -92,10 +92,6 @@ typedef struct /* Get system call information. */ # include - -/* Get the thread descriptor definition. */ -# include - #ifndef LOCK_PREFIX # ifdef UP # define LOCK_PREFIX /* nothing */ @@ -121,6 +117,10 @@ typedef struct /* The TCB can have any size and the memory following the address the thread pointer points to is unspecified. Allocate the TCB there. */ # define TLS_TCB_AT_TP 1 +# define TLS_DTV_AT_TP 0 + +/* Get the thread descriptor definition. */ +# include /* Install the dtv pointer. The pointer passed is to the element with -- cgit 1.4.1