diff options
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | Makeconfig | 1 | ||||
| -rw-r--r-- | include/errno.h | 5 | ||||
| -rw-r--r-- | include/stackinfo.h | 42 | ||||
| -rw-r--r-- | nptl/sysdeps/i386/tls.h | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/powerpc/tls.h | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/s390/tls.h | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/sh/tls.h | 1 | ||||
| -rw-r--r-- | nptl/sysdeps/sparc/tls.h | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/tls.h | 8 | ||||
| -rw-r--r-- | ports/ChangeLog.hppa | 4 | ||||
| -rw-r--r-- | ports/sysdeps/hppa/nptl/tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/aarch64/nptl/tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/alpha/nptl/tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/arm/nptl/tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/ia64/nptl/tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/m68k/nptl/tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/microblaze/nptl/tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/mips/nptl/tls.h | 1 | ||||
| -rw-r--r-- | sysdeps/tile/nptl/tls.h | 1 |
21 files changed, 104 insertions, 13 deletions
@@ -1,3 +1,26 @@ +2014-03-14 Roland McGrath <roland@hack.frob.com> + + * Makeconfig (+gccwarn): Add -Wundef. + * include/errno.h [IS_IN_rtld] [!RTLD_PRIVATE_ERRNO]: #error to catch + a dl-sysdep.h breaking its contract. + [!IS_IN_rtld] (RTLD_PRIVATE_ERRNO): Define it to 0. + * include/stackinfo.h: New file. + * nptl/sysdeps/i386/tls.h (TLS_DTV_AT_TP): New macro. + * nptl/sysdeps/powerpc/tls.h (TLS_TCB_AT_TP): New macro. + * nptl/sysdeps/s390/tls.h (TLS_DTV_AT_TP): New macro. + * nptl/sysdeps/sh/tls.h (TLS_TCB_AT_TP): New macro. + * nptl/sysdeps/sparc/tls.h (TLS_DTV_AT_TP): New macro. + * nptl/sysdeps/x86_64/tls.h (TLS_DTV_AT_TP): New macro. + * sysdeps/aarch64/nptl/tls.h (TLS_TCB_AT_TP): New macro. + * sysdeps/alpha/nptl/tls.h (TLS_TCB_AT_TP): New macro. + * sysdeps/arm/nptl/tls.h (TLS_TCB_AT_TP): New macro. + * sysdeps/ia64/nptl/tls.h (TLS_TCB_AT_TP): New macro. + * sysdeps/m68k/nptl/tls.h (TLS_TCB_AT_TP): New macro. + * sysdeps/mach/hurd/i386/tls.h (TLS_DTV_AT_TP): New macro. + * sysdeps/microblaze/nptl/tls.h (TLS_TCB_AT_TP): New macro. + * sysdeps/mips/nptl/tls.h (TLS_TCB_AT_TP): New macro. + * sysdeps/tile/nptl/tls.h (TLS_TCB_AT_TP): New macro. + 2014-03-14 Adhemerval Zanella <azanella@linux.vnet.ibm.com> [BZ #16707] @@ -685,6 +685,7 @@ ifeq ($(all-warnings),yes) else +gccwarn := -Wall -Wwrite-strings -Winline endif ++gccwarn += -Wundef +gccwarn-c = -Wstrict-prototypes # We do not depend on the address of constants in different files to be diff --git a/include/errno.h b/include/errno.h index f1b93a8..dbf2a61 100644 --- a/include/errno.h +++ b/include/errno.h @@ -6,6 +6,11 @@ # ifdef IS_IN_rtld # include <dl-sysdep.h> +# ifndef RTLD_PRIVATE_ERRNO +# error "dl-sysdep.h must define RTLD_PRIVATE_ERRNO!" +# endif +# else +# define RTLD_PRIVATE_ERRNO 0 # endif # if RTLD_PRIVATE_ERRNO diff --git a/include/stackinfo.h b/include/stackinfo.h new file mode 100644 index 0000000..b9b2278 --- /dev/null +++ b/include/stackinfo.h @@ -0,0 +1,42 @@ +/* Details about the machine's stack: wrapper header. + Copyright (C) 2014 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, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _INCLUDE_STACKINFO_H +#define _INCLUDE_STACKINFO_H 1 + +/* A sysdeps/.../stackinfo.h file defines details for the CPU. + It is obliged to define either _STACK_GROWS_DOWN or _STACK_GROWS_UP. */ +#include_next <stackinfo.h> + +#if defined _STACK_GROWS_DOWN && _STACK_GROWS_DOWN +# ifdef _STACK_GROWS_UP +# error "stackinfo.h should not define both!" +# else +# define _STACK_GROWS_UP 0 +# endif +#elif defined _STACK_GROWS_UP && _STACK_GROWS_UP +# ifdef _STACK_GROWS_DOWN +# error "stackinfo.h should not define both!" +# else +# define _STACK_GROWS_DOWN 0 +# endif +#else +# error "stackinfo.h must define _STACK_GROWS_UP or _STACK_GROWS_DOWN!" +#endif + +#endif /* include/stackinfo.h */ diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h index 9c695c0..4183ee8 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 <nptl/descr.h> - /* 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 <nptl/descr.h> /* 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 c9baf4d..556c8d5 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 <nptl/descr.h> + /* 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 d81019e..2019882 100644 --- a/nptl/sysdeps/s390/tls.h +++ b/nptl/sysdeps/s390/tls.h @@ -73,9 +73,6 @@ typedef struct /* Get system call information. */ # include <sysdep.h> -/* Get the thread descriptor definition. */ -# include <nptl/descr.h> - /* 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 <nptl/descr.h> /* 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 59e49f7..84e464c 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 <nptl/descr.h> diff --git a/nptl/sysdeps/sparc/tls.h b/nptl/sysdeps/sparc/tls.h index b10c68f..755bc23 100644 --- a/nptl/sysdeps/sparc/tls.h +++ b/nptl/sysdeps/sparc/tls.h @@ -69,9 +69,6 @@ typedef struct /* Get system call information. */ # include <sysdep.h> -/* Get the thread descriptor definition. */ -# include <nptl/descr.h> - 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 <nptl/descr.h> /* 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 cbb5e9e..30bd449 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 <sysdep.h> - -/* Get the thread descriptor definition. */ -# include <nptl/descr.h> - #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 <nptl/descr.h> /* Install the dtv pointer. The pointer passed is to the element with diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa index eca733c..61aeabc 100644 --- a/ports/ChangeLog.hppa +++ b/ports/ChangeLog.hppa @@ -1,3 +1,7 @@ +2014-02-28 Roland McGrath <roland@hack.frob.com> + + * sysdeps/hppa/nptl/tls.h (TLS_TCB_AT_TP): New macro. + 2014-03-05 Joseph Myers <joseph@codesourcery.com> * sysdeps/hppa/fpu/libm-test-ulps: Remove individual test ulps. diff --git a/ports/sysdeps/hppa/nptl/tls.h b/ports/sysdeps/hppa/nptl/tls.h index 2880ad3..38132b0 100644 --- a/ports/sysdeps/hppa/nptl/tls.h +++ b/ports/sysdeps/hppa/nptl/tls.h @@ -51,6 +51,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 /* Get the thread descriptor definition. */ # include <nptl/descr.h> diff --git a/sysdeps/aarch64/nptl/tls.h b/sysdeps/aarch64/nptl/tls.h index f03c519..ae2e6c4 100644 --- a/sysdeps/aarch64/nptl/tls.h +++ b/sysdeps/aarch64/nptl/tls.h @@ -48,6 +48,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 /* Get the thread descriptor definition. */ # include <nptl/descr.h> diff --git a/sysdeps/alpha/nptl/tls.h b/sysdeps/alpha/nptl/tls.h index 4894f0b..b2e082d 100644 --- a/sysdeps/alpha/nptl/tls.h +++ b/sysdeps/alpha/nptl/tls.h @@ -42,6 +42,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 /* Get the thread descriptor definition. */ # include <nptl/descr.h> diff --git a/sysdeps/arm/nptl/tls.h b/sysdeps/arm/nptl/tls.h index 8cc0a62..1a2d606 100644 --- a/sysdeps/arm/nptl/tls.h +++ b/sysdeps/arm/nptl/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 /* Get the thread descriptor definition. */ # include <nptl/descr.h> diff --git a/sysdeps/ia64/nptl/tls.h b/sysdeps/ia64/nptl/tls.h index 279d107..3f9225a 100644 --- a/sysdeps/ia64/nptl/tls.h +++ b/sysdeps/ia64/nptl/tls.h @@ -87,6 +87,7 @@ register struct pthread *__thread_self __asm__("r13"); /* The DTV is allocated at the TP; the TCB is placed elsewhere. */ # define TLS_DTV_AT_TP 1 +# define TLS_TCB_AT_TP 0 /* Get the thread descriptor definition. */ # include <nptl/descr.h> diff --git a/sysdeps/m68k/nptl/tls.h b/sysdeps/m68k/nptl/tls.h index 5de079b..471775a 100644 --- a/sysdeps/m68k/nptl/tls.h +++ b/sysdeps/m68k/nptl/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 /* Get the thread descriptor definition. */ # include <nptl/descr.h> diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h index 3f84300..845d53d 100644 --- a/sysdeps/mach/hurd/i386/tls.h +++ b/sysdeps/mach/hurd/i386/tls.h @@ -26,6 +26,7 @@ /* 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 #ifndef __ASSEMBLER__ diff --git a/sysdeps/microblaze/nptl/tls.h b/sysdeps/microblaze/nptl/tls.h index 4cfbdd3..71f1dd9 100644 --- a/sysdeps/microblaze/nptl/tls.h +++ b/sysdeps/microblaze/nptl/tls.h @@ -48,6 +48,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 /* Get the thread descriptor definition. */ # include <nptl/descr.h> diff --git a/sysdeps/mips/nptl/tls.h b/sysdeps/mips/nptl/tls.h index 0a8da54..754d4e4 100644 --- a/sysdeps/mips/nptl/tls.h +++ b/sysdeps/mips/nptl/tls.h @@ -67,6 +67,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 /* Get the thread descriptor definition. */ # include <nptl/descr.h> diff --git a/sysdeps/tile/nptl/tls.h b/sysdeps/tile/nptl/tls.h index d226188..2a9bbc1 100644 --- a/sysdeps/tile/nptl/tls.h +++ b/sysdeps/tile/nptl/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 |