|
 |
147e83 |
commit 498a22333b835a598ccaed4656e97a0ec3573665
|
|
|
147e83 |
Author: Roland McGrath <roland@hack.frob.com>
|
|
|
147e83 |
Date: Fri Mar 14 10:44:34 2014 -0700
|
|
|
147e83 |
|
|
|
147e83 |
Compile with -Wundef.
|
|
|
147e83 |
|
|
|
147e83 |
Conflicts:
|
|
|
147e83 |
Makeconfig
|
|
|
147e83 |
(Textual conflict due to glibc-rh1418978-2-6.patch.)
|
|
|
147e83 |
sysdeps/microblaze/nptl/tls.h
|
|
|
147e83 |
(Our tree does not have a microblaze port, removed manually.)
|
|
|
147e83 |
|
|
|
147e83 |
diff --git a/Makeconfig b/Makeconfig
|
|
|
147e83 |
index f23fd93febdf4a86..02f1cc1255c5ac07 100644
|
|
|
147e83 |
--- a/Makeconfig
|
|
|
147e83 |
+++ b/Makeconfig
|
|
|
147e83 |
@@ -643,6 +643,7 @@ ifeq ($(all-warnings),yes)
|
|
|
147e83 |
else
|
|
|
147e83 |
+gccwarn := -Wall -Wwrite-strings -Winline
|
|
|
147e83 |
endif
|
|
|
147e83 |
++gccwarn += -Wundef
|
|
|
147e83 |
+gccwarn-c = -Wstrict-prototypes -Werror=implicit-function-declaration
|
|
|
147e83 |
|
|
|
147e83 |
# We do not depend on the address of constants in different files to be
|
|
|
147e83 |
diff --git a/include/errno.h b/include/errno.h
|
|
|
147e83 |
index d26a9ee3ff320e3a..7df41dfc3166ef90 100644
|
|
|
147e83 |
--- a/include/errno.h
|
|
|
147e83 |
+++ b/include/errno.h
|
|
|
147e83 |
@@ -6,6 +6,11 @@
|
|
|
147e83 |
|
|
|
147e83 |
# if IS_IN (rtld)
|
|
|
147e83 |
# include <dl-sysdep.h>
|
|
|
147e83 |
+# ifndef RTLD_PRIVATE_ERRNO
|
|
|
147e83 |
+# error "dl-sysdep.h must define RTLD_PRIVATE_ERRNO!"
|
|
|
147e83 |
+# endif
|
|
|
147e83 |
+# else
|
|
|
147e83 |
+# define RTLD_PRIVATE_ERRNO 0
|
|
|
147e83 |
# endif
|
|
|
147e83 |
|
|
|
147e83 |
# if RTLD_PRIVATE_ERRNO
|
|
|
147e83 |
diff --git a/include/stackinfo.h b/include/stackinfo.h
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000000000000..b9b227848753ceb8
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ b/include/stackinfo.h
|
|
|
147e83 |
@@ -0,0 +1,42 @@
|
|
|
147e83 |
+/* Details about the machine's stack: wrapper header.
|
|
|
147e83 |
+ Copyright (C) 2014 Free Software Foundation, Inc.
|
|
|
147e83 |
+ This file is part of the GNU C Library.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
147e83 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
147e83 |
+ License as published by the Free Software Foundation; either
|
|
|
147e83 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
147e83 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
147e83 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
147e83 |
+ Lesser General Public License for more details.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
147e83 |
+ License along with the GNU C Library; if not, see
|
|
|
147e83 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
147e83 |
+
|
|
|
147e83 |
+#ifndef _INCLUDE_STACKINFO_H
|
|
|
147e83 |
+#define _INCLUDE_STACKINFO_H 1
|
|
|
147e83 |
+
|
|
|
147e83 |
+/* A sysdeps/.../stackinfo.h file defines details for the CPU.
|
|
|
147e83 |
+ It is obliged to define either _STACK_GROWS_DOWN or _STACK_GROWS_UP. */
|
|
|
147e83 |
+#include_next <stackinfo.h>
|
|
|
147e83 |
+
|
|
|
147e83 |
+#if defined _STACK_GROWS_DOWN && _STACK_GROWS_DOWN
|
|
|
147e83 |
+# ifdef _STACK_GROWS_UP
|
|
|
147e83 |
+# error "stackinfo.h should not define both!"
|
|
|
147e83 |
+# else
|
|
|
147e83 |
+# define _STACK_GROWS_UP 0
|
|
|
147e83 |
+# endif
|
|
|
147e83 |
+#elif defined _STACK_GROWS_UP && _STACK_GROWS_UP
|
|
|
147e83 |
+# ifdef _STACK_GROWS_DOWN
|
|
|
147e83 |
+# error "stackinfo.h should not define both!"
|
|
|
147e83 |
+# else
|
|
|
147e83 |
+# define _STACK_GROWS_DOWN 0
|
|
|
147e83 |
+# endif
|
|
|
147e83 |
+#else
|
|
|
147e83 |
+# error "stackinfo.h must define _STACK_GROWS_UP or _STACK_GROWS_DOWN!"
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
+
|
|
|
147e83 |
+#endif /* include/stackinfo.h */
|
|
|
147e83 |
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h
|
|
|
147e83 |
index 90c7a534bfd0ed16..55877d71d2051d4c 100644
|
|
|
147e83 |
--- a/nptl/sysdeps/i386/tls.h
|
|
|
147e83 |
+++ b/nptl/sysdeps/i386/tls.h
|
|
|
147e83 |
@@ -102,9 +102,6 @@ union user_desc_init
|
|
|
147e83 |
};
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-/* Get the thread descriptor definition. */
|
|
|
147e83 |
-# include <nptl/descr.h>
|
|
|
147e83 |
-
|
|
|
147e83 |
/* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t),
|
|
|
147e83 |
because NPTL getpid, __libc_alloca_cutoff etc. need (almost) the whole
|
|
|
147e83 |
struct pthread even when not linked with -lpthread. */
|
|
|
147e83 |
@@ -122,6 +119,10 @@ union user_desc_init
|
|
|
147e83 |
/* The TCB can have any size and the memory following the address the
|
|
|
147e83 |
thread pointer points to is unspecified. Allocate the TCB there. */
|
|
|
147e83 |
# define TLS_TCB_AT_TP 1
|
|
|
147e83 |
+# define TLS_DTV_AT_TP 0
|
|
|
147e83 |
+
|
|
|
147e83 |
+/* Get the thread descriptor definition. */
|
|
|
147e83 |
+# include <nptl/descr.h>
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
/* Install the dtv pointer. The pointer passed is to the element with
|
|
|
147e83 |
diff --git a/nptl/sysdeps/powerpc/tls.h b/nptl/sysdeps/powerpc/tls.h
|
|
|
147e83 |
index 33efc7aea638f138..a04dfa89aa1ec73c 100644
|
|
|
147e83 |
--- a/nptl/sysdeps/powerpc/tls.h
|
|
|
147e83 |
+++ b/nptl/sysdeps/powerpc/tls.h
|
|
|
147e83 |
@@ -49,6 +49,7 @@ typedef union dtv
|
|
|
147e83 |
|
|
|
147e83 |
/* The TP points to the start of the thread blocks. */
|
|
|
147e83 |
# define TLS_DTV_AT_TP 1
|
|
|
147e83 |
+# define TLS_TCB_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
/* We use the multiple_threads field in the pthread struct */
|
|
|
147e83 |
#define TLS_MULTIPLE_THREADS_IN_TCB 1
|
|
|
147e83 |
@@ -56,6 +57,7 @@ typedef union dtv
|
|
|
147e83 |
/* Get the thread descriptor definition. */
|
|
|
147e83 |
# include <nptl/descr.h>
|
|
|
147e83 |
|
|
|
147e83 |
+
|
|
|
147e83 |
/* The stack_guard is accessed directly by GCC -fstack-protector code,
|
|
|
147e83 |
so it is a part of public ABI. The dtv and pointer_guard fields
|
|
|
147e83 |
are private. */
|
|
|
147e83 |
diff --git a/nptl/sysdeps/s390/tls.h b/nptl/sysdeps/s390/tls.h
|
|
|
147e83 |
index 4b1ce051c4a87652..580196b7bfee3046 100644
|
|
|
147e83 |
--- a/nptl/sysdeps/s390/tls.h
|
|
|
147e83 |
+++ b/nptl/sysdeps/s390/tls.h
|
|
|
147e83 |
@@ -73,9 +73,6 @@ typedef struct
|
|
|
147e83 |
/* Get system call information. */
|
|
|
147e83 |
# include <sysdep.h>
|
|
|
147e83 |
|
|
|
147e83 |
-/* Get the thread descriptor definition. */
|
|
|
147e83 |
-# include <nptl/descr.h>
|
|
|
147e83 |
-
|
|
|
147e83 |
/* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t),
|
|
|
147e83 |
because NPTL getpid, __libc_alloca_cutoff etc. need (almost) the whole
|
|
|
147e83 |
struct pthread even when not linked with -lpthread. */
|
|
|
147e83 |
@@ -93,6 +90,10 @@ typedef struct
|
|
|
147e83 |
/* The TCB can have any size and the memory following the address the
|
|
|
147e83 |
thread pointer points to is unspecified. Allocate the TCB there. */
|
|
|
147e83 |
# define TLS_TCB_AT_TP 1
|
|
|
147e83 |
+# define TLS_DTV_AT_TP 0
|
|
|
147e83 |
+
|
|
|
147e83 |
+/* Get the thread descriptor definition. */
|
|
|
147e83 |
+# include <nptl/descr.h>
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
/* Install the dtv pointer. The pointer passed is to the element with
|
|
|
147e83 |
diff --git a/nptl/sysdeps/sh/tls.h b/nptl/sysdeps/sh/tls.h
|
|
|
147e83 |
index a7f53dfecf0ca6d6..4659af51c0be7595 100644
|
|
|
147e83 |
--- a/nptl/sysdeps/sh/tls.h
|
|
|
147e83 |
+++ b/nptl/sysdeps/sh/tls.h
|
|
|
147e83 |
@@ -76,6 +76,7 @@ typedef struct
|
|
|
147e83 |
|
|
|
147e83 |
/* The TLS blocks start right after the TCB. */
|
|
|
147e83 |
# define TLS_DTV_AT_TP 1
|
|
|
147e83 |
+# define TLS_TCB_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
/* Get the thread descriptor definition. */
|
|
|
147e83 |
# include <nptl/descr.h>
|
|
|
147e83 |
diff --git a/nptl/sysdeps/sparc/tls.h b/nptl/sysdeps/sparc/tls.h
|
|
|
147e83 |
index cfc9d96c67027caf..2ef0d4e1012259ad 100644
|
|
|
147e83 |
--- a/nptl/sysdeps/sparc/tls.h
|
|
|
147e83 |
+++ b/nptl/sysdeps/sparc/tls.h
|
|
|
147e83 |
@@ -69,9 +69,6 @@ typedef struct
|
|
|
147e83 |
/* Get system call information. */
|
|
|
147e83 |
# include <sysdep.h>
|
|
|
147e83 |
|
|
|
147e83 |
-/* Get the thread descriptor definition. */
|
|
|
147e83 |
-# include <nptl/descr.h>
|
|
|
147e83 |
-
|
|
|
147e83 |
register struct pthread *__thread_self __asm__("%g7");
|
|
|
147e83 |
|
|
|
147e83 |
/* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t),
|
|
|
147e83 |
@@ -91,6 +88,10 @@ register struct pthread *__thread_self __asm__("%g7");
|
|
|
147e83 |
/* The TCB can have any size and the memory following the address the
|
|
|
147e83 |
thread pointer points to is unspecified. Allocate the TCB there. */
|
|
|
147e83 |
# define TLS_TCB_AT_TP 1
|
|
|
147e83 |
+# define TLS_DTV_AT_TP 0
|
|
|
147e83 |
+
|
|
|
147e83 |
+/* Get the thread descriptor definition. */
|
|
|
147e83 |
+# include <nptl/descr.h>
|
|
|
147e83 |
|
|
|
147e83 |
/* Install the dtv pointer. The pointer passed is to the element with
|
|
|
147e83 |
index -1 which contain the length. */
|
|
|
147e83 |
diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h
|
|
|
147e83 |
index cfba4e142ac5dae8..37e9af71b80d18b0 100644
|
|
|
147e83 |
--- a/nptl/sysdeps/x86_64/tls.h
|
|
|
147e83 |
+++ b/nptl/sysdeps/x86_64/tls.h
|
|
|
147e83 |
@@ -91,10 +91,6 @@ typedef struct
|
|
|
147e83 |
/* Get system call information. */
|
|
|
147e83 |
# include <sysdep.h>
|
|
|
147e83 |
|
|
|
147e83 |
-
|
|
|
147e83 |
-/* Get the thread descriptor definition. */
|
|
|
147e83 |
-# include <nptl/descr.h>
|
|
|
147e83 |
-
|
|
|
147e83 |
#ifndef LOCK_PREFIX
|
|
|
147e83 |
# ifdef UP
|
|
|
147e83 |
# define LOCK_PREFIX /* nothing */
|
|
|
147e83 |
@@ -120,6 +116,10 @@ typedef struct
|
|
|
147e83 |
/* The TCB can have any size and the memory following the address the
|
|
|
147e83 |
thread pointer points to is unspecified. Allocate the TCB there. */
|
|
|
147e83 |
# define TLS_TCB_AT_TP 1
|
|
|
147e83 |
+# define TLS_DTV_AT_TP 0
|
|
|
147e83 |
+
|
|
|
147e83 |
+/* Get the thread descriptor definition. */
|
|
|
147e83 |
+# include <nptl/descr.h>
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
/* Install the dtv pointer. The pointer passed is to the element with
|
|
|
147e83 |
diff --git a/ports/sysdeps/hppa/nptl/tls.h b/ports/sysdeps/hppa/nptl/tls.h
|
|
|
147e83 |
index 5eb55a53603bb31e..be14fe6599c9f41b 100644
|
|
|
147e83 |
--- a/ports/sysdeps/hppa/nptl/tls.h
|
|
|
147e83 |
+++ b/ports/sysdeps/hppa/nptl/tls.h
|
|
|
147e83 |
@@ -51,6 +51,7 @@ typedef union dtv
|
|
|
147e83 |
|
|
|
147e83 |
/* The TP points to the start of the thread blocks. */
|
|
|
147e83 |
# define TLS_DTV_AT_TP 1
|
|
|
147e83 |
+# define TLS_TCB_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
/* Get the thread descriptor definition. */
|
|
|
147e83 |
# include <nptl/descr.h>
|
|
|
147e83 |
diff --git a/sysdeps/aarch64/nptl/tls.h b/sysdeps/aarch64/nptl/tls.h
|
|
|
147e83 |
index 05135db57ab69ef6..e08ff732efcc4fa2 100644
|
|
|
147e83 |
--- a/sysdeps/aarch64/nptl/tls.h
|
|
|
147e83 |
+++ b/sysdeps/aarch64/nptl/tls.h
|
|
|
147e83 |
@@ -48,6 +48,7 @@ typedef union dtv
|
|
|
147e83 |
|
|
|
147e83 |
/* The TP points to the start of the thread blocks. */
|
|
|
147e83 |
# define TLS_DTV_AT_TP 1
|
|
|
147e83 |
+# define TLS_TCB_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
/* Get the thread descriptor definition. */
|
|
|
147e83 |
# include <nptl/descr.h>
|
|
|
147e83 |
diff --git a/sysdeps/alpha/nptl/tls.h b/sysdeps/alpha/nptl/tls.h
|
|
|
147e83 |
index 18c29c80fa369e35..f593ba7162954e99 100644
|
|
|
147e83 |
--- a/sysdeps/alpha/nptl/tls.h
|
|
|
147e83 |
+++ b/sysdeps/alpha/nptl/tls.h
|
|
|
147e83 |
@@ -42,6 +42,7 @@ typedef union dtv
|
|
|
147e83 |
|
|
|
147e83 |
/* The TP points to the start of the thread blocks. */
|
|
|
147e83 |
# define TLS_DTV_AT_TP 1
|
|
|
147e83 |
+# define TLS_TCB_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
/* Get the thread descriptor definition. */
|
|
|
147e83 |
# include <nptl/descr.h>
|
|
|
147e83 |
diff --git a/sysdeps/arm/nptl/tls.h b/sysdeps/arm/nptl/tls.h
|
|
|
147e83 |
index 52f695e58b22b406..00b1e53c33064a2e 100644
|
|
|
147e83 |
--- a/sysdeps/arm/nptl/tls.h
|
|
|
147e83 |
+++ b/sysdeps/arm/nptl/tls.h
|
|
|
147e83 |
@@ -49,6 +49,7 @@ typedef union dtv
|
|
|
147e83 |
|
|
|
147e83 |
/* The TP points to the start of the thread blocks. */
|
|
|
147e83 |
# define TLS_DTV_AT_TP 1
|
|
|
147e83 |
+# define TLS_TCB_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
/* Get the thread descriptor definition. */
|
|
|
147e83 |
# include <nptl/descr.h>
|
|
|
147e83 |
diff --git a/sysdeps/ia64/nptl/tls.h b/sysdeps/ia64/nptl/tls.h
|
|
|
147e83 |
index 77574e55db890043..f270f958bcfc53de 100644
|
|
|
147e83 |
--- a/sysdeps/ia64/nptl/tls.h
|
|
|
147e83 |
+++ b/sysdeps/ia64/nptl/tls.h
|
|
|
147e83 |
@@ -87,6 +87,7 @@ register struct pthread *__thread_self __asm__("r13");
|
|
|
147e83 |
|
|
|
147e83 |
/* The DTV is allocated at the TP; the TCB is placed elsewhere. */
|
|
|
147e83 |
# define TLS_DTV_AT_TP 1
|
|
|
147e83 |
+# define TLS_TCB_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
/* Get the thread descriptor definition. */
|
|
|
147e83 |
# include <nptl/descr.h>
|
|
|
147e83 |
diff --git a/sysdeps/m68k/nptl/tls.h b/sysdeps/m68k/nptl/tls.h
|
|
|
147e83 |
index 8b0909237b303695..7f4bbfb9162dd610 100644
|
|
|
147e83 |
--- a/sysdeps/m68k/nptl/tls.h
|
|
|
147e83 |
+++ b/sysdeps/m68k/nptl/tls.h
|
|
|
147e83 |
@@ -49,6 +49,7 @@ typedef union dtv
|
|
|
147e83 |
|
|
|
147e83 |
/* The TP points to the start of the thread blocks. */
|
|
|
147e83 |
# define TLS_DTV_AT_TP 1
|
|
|
147e83 |
+# define TLS_TCB_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
/* Get the thread descriptor definition. */
|
|
|
147e83 |
# include <nptl/descr.h>
|
|
|
147e83 |
diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h
|
|
|
147e83 |
index d0a72f0e5c032820..8619820d3b0502b5 100644
|
|
|
147e83 |
--- a/sysdeps/mach/hurd/i386/tls.h
|
|
|
147e83 |
+++ b/sysdeps/mach/hurd/i386/tls.h
|
|
|
147e83 |
@@ -26,6 +26,7 @@
|
|
|
147e83 |
/* The TCB can have any size and the memory following the address the
|
|
|
147e83 |
thread pointer points to is unspecified. Allocate the TCB there. */
|
|
|
147e83 |
#define TLS_TCB_AT_TP 1
|
|
|
147e83 |
+#define TLS_DTV_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
#ifndef __ASSEMBLER__
|
|
|
147e83 |
|
|
|
147e83 |
diff --git a/sysdeps/mips/nptl/tls.h b/sysdeps/mips/nptl/tls.h
|
|
|
147e83 |
index 8a97437bad4752c4..669a79c0c64cb566 100644
|
|
|
147e83 |
--- a/sysdeps/mips/nptl/tls.h
|
|
|
147e83 |
+++ b/sysdeps/mips/nptl/tls.h
|
|
|
147e83 |
@@ -62,6 +62,7 @@ typedef union dtv
|
|
|
147e83 |
|
|
|
147e83 |
/* The TP points to the start of the thread blocks. */
|
|
|
147e83 |
# define TLS_DTV_AT_TP 1
|
|
|
147e83 |
+# define TLS_TCB_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
/* Get the thread descriptor definition. */
|
|
|
147e83 |
# include <nptl/descr.h>
|
|
|
147e83 |
diff --git a/sysdeps/tile/nptl/tls.h b/sysdeps/tile/nptl/tls.h
|
|
|
147e83 |
index 303a95e000fee30f..132de9021e5651f0 100644
|
|
|
147e83 |
--- a/sysdeps/tile/nptl/tls.h
|
|
|
147e83 |
+++ b/sysdeps/tile/nptl/tls.h
|
|
|
147e83 |
@@ -49,6 +49,7 @@ typedef union dtv
|
|
|
147e83 |
|
|
|
147e83 |
/* The TP points to the start of the thread blocks. */
|
|
|
147e83 |
# define TLS_DTV_AT_TP 1
|
|
|
147e83 |
+# define TLS_TCB_AT_TP 0
|
|
|
147e83 |
|
|
|
147e83 |
/* We use the multiple_threads field in the pthread struct */
|
|
|
147e83 |
#define TLS_MULTIPLE_THREADS_IN_TCB 1
|