aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-02-04 10:29:04 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-11-13 12:59:19 -0300
commit01bd62517cc242ae503aaa7002e9e94551803e4d (patch)
tree4eb2b077db03794483dffa01795addead2eb88ef
parent26f7c72a99f4e46755ec2ff23a6a7cf9c2c337c3 (diff)
downloadglibc-01bd62517cc242ae503aaa7002e9e94551803e4d.zip
glibc-01bd62517cc242ae503aaa7002e9e94551803e4d.tar.gz
glibc-01bd62517cc242ae503aaa7002e9e94551803e4d.tar.bz2
Remove tls.h inclusion from internal errno.h
The tls.h inclusion is not really required and limits possible definition on more arch specific headers. This is a cleanup to allow inline functions on sysdep.h, more specifically on i386 and ia64 which requires to access some tls definitions its own. No semantic changes expected, checked with a build against all affected ABIs.
-rw-r--r--include/errno.h2
-rw-r--r--io/lchmod.c4
-rw-r--r--malloc/reallocarray.c1
-rw-r--r--misc/ustat.c1
-rw-r--r--nss/nss_fgetent_r.c1
-rw-r--r--posix/execl.c1
-rw-r--r--posix/execle.c1
-rw-r--r--posix/execlp.c1
-rw-r--r--posix/spawn_faction_addchdir.c2
-rw-r--r--pwd/putpwent.c1
-rw-r--r--signal/sigempty.c1
-rw-r--r--signal/sigismem.c1
-rw-r--r--sysdeps/generic/internal-signals.h1
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c3
-rw-r--r--sysdeps/mach/hurd/mmap64.c1
-rw-r--r--sysdeps/mach/hurd/waitid.c1
-rw-r--r--sysdeps/microblaze/backtrace.c1
-rw-r--r--sysdeps/nptl/futex-internal.h1
-rw-r--r--sysdeps/unix/sysv/linux/adjtime.c1
-rw-r--r--sysdeps/unix/sysv/linux/clock_getcpuclockid.c1
-rw-r--r--sysdeps/unix/sysv/linux/faccessat.c6
-rw-r--r--sysdeps/unix/sysv/linux/ftime.c1
-rw-r--r--sysdeps/unix/sysv/linux/ftruncate64.c1
-rw-r--r--sysdeps/unix/sysv/linux/generic/chmod.c4
-rw-r--r--sysdeps/unix/sysv/linux/generic/chown.c4
-rw-r--r--sysdeps/unix/sysv/linux/generic/dup2.c3
-rw-r--r--sysdeps/unix/sysv/linux/generic/epoll_create.c5
-rw-r--r--sysdeps/unix/sysv/linux/generic/inotify_init.c5
-rw-r--r--sysdeps/unix/sysv/linux/generic/lchown.c4
-rw-r--r--sysdeps/unix/sysv/linux/generic/link.c3
-rw-r--r--sysdeps/unix/sysv/linux/generic/pipe.c3
-rw-r--r--sysdeps/unix/sysv/linux/generic/readlink.c2
-rw-r--r--sysdeps/unix/sysv/linux/generic/rmdir.c4
-rw-r--r--sysdeps/unix/sysv/linux/generic/symlink.c3
-rw-r--r--sysdeps/unix/sysv/linux/generic/unlink.c4
-rw-r--r--sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c2
-rw-r--r--sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h1
-rw-r--r--sysdeps/unix/sysv/linux/generic/wordsize-32/sendfile.c2
-rw-r--r--sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c2
-rw-r--r--sysdeps/unix/sysv/linux/getentropy.c1
-rw-r--r--sysdeps/unix/sysv/linux/getrlimit.c3
-rw-r--r--sysdeps/unix/sysv/linux/getrlimit64.c1
-rw-r--r--sysdeps/unix/sysv/linux/gettimeofday.c7
-rw-r--r--sysdeps/unix/sysv/linux/hppa/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/internal-signals.h1
-rw-r--r--sysdeps/unix/sysv/linux/libc_fatal.c2
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/mknodat.c1
-rw-r--r--sysdeps/unix/sysv/linux/netlink_assert_response.c1
-rw-r--r--sysdeps/unix/sysv/linux/posix_fadvise64.c1
-rw-r--r--sysdeps/unix/sysv/linux/prlimit.c4
-rw-r--r--sysdeps/unix/sysv/linux/readahead.c2
-rw-r--r--sysdeps/unix/sysv/linux/riscv/sysconf.c1
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c2
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c2
-rw-r--r--sysdeps/unix/sysv/linux/semop.c2
-rw-r--r--sysdeps/unix/sysv/linux/setrlimit.c3
-rw-r--r--sysdeps/unix/sysv/linux/setrlimit64.c1
-rw-r--r--sysdeps/unix/sysv/linux/settimezone.c1
-rw-r--r--sysdeps/unix/sysv/linux/shmget.c3
-rw-r--r--sysdeps/unix/sysv/linux/socketcall.h2
-rw-r--r--sysdeps/unix/sysv/linux/speed.c2
-rw-r--r--sysdeps/unix/sysv/linux/statx.c2
-rw-r--r--sysdeps/unix/sysv/linux/sysctl.c1
-rw-r--r--sysdeps/unix/sysv/linux/sysdep.h1
-rw-r--r--sysdeps/unix/sysv/linux/truncate64.c1
-rw-r--r--sysdeps/unix/sysv/linux/ustat.c2
-rw-r--r--sysdeps/unix/sysv/linux/xmknod.c1
-rw-r--r--sysdeps/unix/sysv/linux/xmknodat.c1
-rw-r--r--sysdeps/unix/sysv/linux/xstatconv.c1
-rw-r--r--sysdeps/x86_64/stackinfo.h10
71 files changed, 83 insertions, 70 deletions
diff --git a/include/errno.h b/include/errno.h
index 457114b..c361a78 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -22,8 +22,6 @@ extern int rtld_errno attribute_hidden;
# elif IS_IN_LIB && !IS_IN (rtld)
-# include <tls.h>
-
# undef errno
# if IS_IN (libc)
# define errno __libc_errno
diff --git a/io/lchmod.c b/io/lchmod.c
index 8b78803..3a0f714 100644
--- a/io/lchmod.c
+++ b/io/lchmod.c
@@ -16,10 +16,8 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <fcntl.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include <sys/stat.h>
/* Change the protections of FILE to MODE. */
int
diff --git a/malloc/reallocarray.c b/malloc/reallocarray.c
index aca689e..20b0215 100644
--- a/malloc/reallocarray.c
+++ b/malloc/reallocarray.c
@@ -17,6 +17,7 @@
not, see <https://www.gnu.org/licenses/>. */
#include <errno.h>
+#include <stdlib.h>
#include <malloc.h>
void *
diff --git a/misc/ustat.c b/misc/ustat.c
index a1b057f..ad75c5c 100644
--- a/misc/ustat.c
+++ b/misc/ustat.c
@@ -23,6 +23,7 @@
# include <unistd.h>
# include <errno.h>
+# include <sys/types.h>
struct ustat
{
diff --git a/nss/nss_fgetent_r.c b/nss/nss_fgetent_r.c
index 8f7c5b5..7fecde7 100644
--- a/nss/nss_fgetent_r.c
+++ b/nss/nss_fgetent_r.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <nss_files.h>
+#include <stdbool.h>
int
__nss_fgetent_r (FILE *fp, void *result, char *buffer, size_t buffer_length,
diff --git a/posix/execl.c b/posix/execl.c
index 8d319a4..61aef66 100644
--- a/posix/execl.c
+++ b/posix/execl.c
@@ -19,6 +19,7 @@
#include <errno.h>
#include <stdarg.h>
#include <sys/param.h>
+#include <stddef.h>
/* Execute PATH with all arguments after PATH until
a NULL pointer and environment from `environ'. */
diff --git a/posix/execle.c b/posix/execle.c
index 7539ce6..f6608ee 100644
--- a/posix/execle.c
+++ b/posix/execle.c
@@ -19,6 +19,7 @@
#include <stdarg.h>
#include <errno.h>
#include <sys/param.h>
+#include <stddef.h>
/* Execute PATH with all arguments after PATH until a NULL pointer,
and the argument after that for environment. */
diff --git a/posix/execlp.c b/posix/execlp.c
index 9eaca5f..4761962 100644
--- a/posix/execlp.c
+++ b/posix/execlp.c
@@ -19,6 +19,7 @@
#include <stdarg.h>
#include <errno.h>
#include <sys/param.h>
+#include <stddef.h>
/* Execute FILE, searching in the `PATH' environment variable if
it contains no slashes, with all arguments after FILE until a
diff --git a/posix/spawn_faction_addchdir.c b/posix/spawn_faction_addchdir.c
index 6558628..20a3ba9 100644
--- a/posix/spawn_faction_addchdir.c
+++ b/posix/spawn_faction_addchdir.c
@@ -19,7 +19,7 @@
#include <errno.h>
#include <spawn.h>
#include <string.h>
-
+#include <stdlib.h>
#include "spawn_int.h"
int
diff --git a/pwd/putpwent.c b/pwd/putpwent.c
index a6673ac..baf312a 100644
--- a/pwd/putpwent.c
+++ b/pwd/putpwent.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <stdio.h>
#include <pwd.h>
+#include <stdlib.h>
#include <nss.h>
#define _S(x) x ?: ""
diff --git a/signal/sigempty.c b/signal/sigempty.c
index 31b1145..01848c8 100644
--- a/signal/sigempty.c
+++ b/signal/sigempty.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <signal.h>
#include <sigsetops.h>
+#include <stddef.h>
/* Clear all signals from SET. */
int
diff --git a/signal/sigismem.c b/signal/sigismem.c
index 728d58f..c788ca8 100644
--- a/signal/sigismem.c
+++ b/signal/sigismem.c
@@ -17,6 +17,7 @@
#include <errno.h>
#include <signal.h>
+#include <stddef.h>
#include <sigsetops.h>
/* Return 1 if SIGNO is in SET, 0 if not. */
diff --git a/sysdeps/generic/internal-signals.h b/sysdeps/generic/internal-signals.h
index 73a0c29..cd675e4 100644
--- a/sysdeps/generic/internal-signals.h
+++ b/sysdeps/generic/internal-signals.h
@@ -22,6 +22,7 @@
#include <signal.h>
#include <sigsetops.h>
#include <stdbool.h>
+#include <stddef.h>
static inline bool
__is_internal_signal (int sig)
diff --git a/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c b/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c
index f77253e..6ced407 100644
--- a/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c
@@ -20,9 +20,6 @@
#include <float.h>
#include <math.h>
-/* Need to set this when including gmp headers after system headers. */
-#define HAVE_ALLOCA 1
-
#include "gmp.h"
#include "gmp-impl.h"
diff --git a/sysdeps/mach/hurd/mmap64.c b/sysdeps/mach/hurd/mmap64.c
index 6d8566b..23d7ca7 100644
--- a/sysdeps/mach/hurd/mmap64.c
+++ b/sysdeps/mach/hurd/mmap64.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <sys/mman.h>
#include <sys/types.h>
+#include <mach/port.h>
/* Map addresses starting near ADDR and extending for LEN bytes. From
OFFSET into the file FD describes according to PROT and FLAGS. If ADDR
diff --git a/sysdeps/mach/hurd/waitid.c b/sysdeps/mach/hurd/waitid.c
index dce7233..044a1dd 100644
--- a/sysdeps/mach/hurd/waitid.c
+++ b/sysdeps/mach/hurd/waitid.c
@@ -19,6 +19,7 @@
#include <errno.h>
#include <sys/wait.h>
+#include <stddef.h>
int
__waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
diff --git a/sysdeps/microblaze/backtrace.c b/sysdeps/microblaze/backtrace.c
index 8af5a4d..f4a4b69 100644
--- a/sysdeps/microblaze/backtrace.c
+++ b/sysdeps/microblaze/backtrace.c
@@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <sysdep.h>
#include <signal.h>
diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h
index cd356e4..c27d0cd 100644
--- a/sysdeps/nptl/futex-internal.h
+++ b/sysdeps/nptl/futex-internal.h
@@ -23,6 +23,7 @@
#include <sys/time.h>
#include <stdio.h>
#include <stdbool.h>
+#include <lowlevellock-futex.h>
#include <libc-diag.h>
/* This file defines futex operations used internally in glibc. A futex
diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c
index 6d1d1b6..8e7c8cc 100644
--- a/sysdeps/unix/sysv/linux/adjtime.c
+++ b/sysdeps/unix/sysv/linux/adjtime.c
@@ -19,6 +19,7 @@
#include <limits.h>
#include <sys/time.h>
#include <sys/timex.h>
+#include <sysdep.h>
#define MAX_SEC (INT_MAX / 1000000L - 2)
#define MIN_SEC (INT_MIN / 1000000L + 2)
diff --git a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c
index 7d2e6d6..1eb780a 100644
--- a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c
+++ b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c
@@ -20,6 +20,7 @@
#include <time.h>
#include <unistd.h>
#include "kernel-posix-cpu-timers.h"
+#include <sysdep.h>
#include <shlib-compat.h>
int
diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c
index b697053..5d07837 100644
--- a/sysdeps/unix/sysv/linux/faccessat.c
+++ b/sysdeps/unix/sysv/linux/faccessat.c
@@ -16,14 +16,10 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <fcntl.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
#include <unistd.h>
#include <sys/types.h>
-#include <alloca.h>
+#include <sys/stat.h>
#include <sysdep.h>
diff --git a/sysdeps/unix/sysv/linux/ftime.c b/sysdeps/unix/sysv/linux/ftime.c
index 1755fcf..2f43b76 100644
--- a/sysdeps/unix/sysv/linux/ftime.c
+++ b/sysdeps/unix/sysv/linux/ftime.c
@@ -18,6 +18,7 @@
#include <features.h>
#include <sys/timeb.h>
+#include <time.h>
#include <errno.h>
int
diff --git a/sysdeps/unix/sysv/linux/ftruncate64.c b/sysdeps/unix/sysv/linux/ftruncate64.c
index 606a0e8..3d43a5a 100644
--- a/sysdeps/unix/sysv/linux/ftruncate64.c
+++ b/sysdeps/unix/sysv/linux/ftruncate64.c
@@ -17,7 +17,6 @@
#include <unistd.h>
#include <sysdep.h>
-#include <errno.h>
#ifndef __NR_ftruncate64
# define __NR_ftruncate64 __NR_ftruncate
diff --git a/sysdeps/unix/sysv/linux/generic/chmod.c b/sysdeps/unix/sysv/linux/generic/chmod.c
index b9631a9..802e400 100644
--- a/sysdeps/unix/sysv/linux/generic/chmod.c
+++ b/sysdeps/unix/sysv/linux/generic/chmod.c
@@ -16,11 +16,9 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
#include <fcntl.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sysdep.h>
/* Change the protections of FILE to MODE. */
int
diff --git a/sysdeps/unix/sysv/linux/generic/chown.c b/sysdeps/unix/sysv/linux/generic/chown.c
index d676eef..57a8183 100644
--- a/sysdeps/unix/sysv/linux/generic/chown.c
+++ b/sysdeps/unix/sysv/linux/generic/chown.c
@@ -16,11 +16,9 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
#include <unistd.h>
#include <fcntl.h>
-#include <sys/types.h>
+#include <sysdep.h>
/* Change the owner and group of FILE. */
int
diff --git a/sysdeps/unix/sysv/linux/generic/dup2.c b/sysdeps/unix/sysv/linux/generic/dup2.c
index 32592f9..dfa348b 100644
--- a/sysdeps/unix/sysv/linux/generic/dup2.c
+++ b/sysdeps/unix/sysv/linux/generic/dup2.c
@@ -16,10 +16,9 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <fcntl.h>
-#include <limits.h>
#include <unistd.h>
+#include <sysdep.h>
/* Duplicate FD to FD2, closing the old FD2 and making FD2 be
open the same file as FD is. Return FD2 or -1. */
diff --git a/sysdeps/unix/sysv/linux/generic/epoll_create.c b/sysdeps/unix/sysv/linux/generic/epoll_create.c
index e3eac4a..1715c6d 100644
--- a/sysdeps/unix/sysv/linux/generic/epoll_create.c
+++ b/sysdeps/unix/sysv/linux/generic/epoll_create.c
@@ -16,11 +16,8 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <stddef.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
#include <sys/epoll.h>
+#include <sysdep.h>
libc_hidden_proto (epoll_create)
diff --git a/sysdeps/unix/sysv/linux/generic/inotify_init.c b/sysdeps/unix/sysv/linux/generic/inotify_init.c
index 7f84124..25a323f 100644
--- a/sysdeps/unix/sysv/linux/generic/inotify_init.c
+++ b/sysdeps/unix/sysv/linux/generic/inotify_init.c
@@ -16,11 +16,8 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <stddef.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
#include <sys/inotify.h>
+#include <sysdep.h>
libc_hidden_proto (inotify_init)
diff --git a/sysdeps/unix/sysv/linux/generic/lchown.c b/sysdeps/unix/sysv/linux/generic/lchown.c
index a483241..379079e 100644
--- a/sysdeps/unix/sysv/linux/generic/lchown.c
+++ b/sysdeps/unix/sysv/linux/generic/lchown.c
@@ -16,11 +16,9 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
#include <unistd.h>
#include <fcntl.h>
-#include <sys/types.h>
+#include <sysdep.h>
/* Change the owner and group of FILE. */
int
diff --git a/sysdeps/unix/sysv/linux/generic/link.c b/sysdeps/unix/sysv/linux/generic/link.c
index a038ba1..1baa6b5 100644
--- a/sysdeps/unix/sysv/linux/generic/link.c
+++ b/sysdeps/unix/sysv/linux/generic/link.c
@@ -16,10 +16,9 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
#include <unistd.h>
#include <fcntl.h>
+#include <sysdep.h>
/* Make a link to FROM called TO. */
int
diff --git a/sysdeps/unix/sysv/linux/generic/pipe.c b/sysdeps/unix/sysv/linux/generic/pipe.c
index 5d4a95f..52f3231 100644
--- a/sysdeps/unix/sysv/linux/generic/pipe.c
+++ b/sysdeps/unix/sysv/linux/generic/pipe.c
@@ -16,9 +16,8 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <unistd.h>
-#include <stddef.h>
+#include <sysdep.h>
/* Create a one-way communication channel (__pipe).
If successful, two file descriptors are stored in PIPEDES;
diff --git a/sysdeps/unix/sysv/linux/generic/readlink.c b/sysdeps/unix/sysv/linux/generic/readlink.c
index 721f84e..6f690a9 100644
--- a/sysdeps/unix/sysv/linux/generic/readlink.c
+++ b/sysdeps/unix/sysv/linux/generic/readlink.c
@@ -16,9 +16,9 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
+#include <sysdep.h>
/* Read the contents of the symbolic link PATH into no more than
LEN bytes of BUF. The contents are not null-terminated.
diff --git a/sysdeps/unix/sysv/linux/generic/rmdir.c b/sysdeps/unix/sysv/linux/generic/rmdir.c
index e357a10..f9d721f 100644
--- a/sysdeps/unix/sysv/linux/generic/rmdir.c
+++ b/sysdeps/unix/sysv/linux/generic/rmdir.c
@@ -16,11 +16,9 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
#include <unistd.h>
#include <fcntl.h>
-
+#include <sysdep.h>
/* Remove the directory PATH. */
int
diff --git a/sysdeps/unix/sysv/linux/generic/symlink.c b/sysdeps/unix/sysv/linux/generic/symlink.c
index cddc11a..2c358f5 100644
--- a/sysdeps/unix/sysv/linux/generic/symlink.c
+++ b/sysdeps/unix/sysv/linux/generic/symlink.c
@@ -16,10 +16,9 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
#include <unistd.h>
#include <fcntl.h>
+#include <sysdep.h>
/* Make a link to FROM called TO. */
int
diff --git a/sysdeps/unix/sysv/linux/generic/unlink.c b/sysdeps/unix/sysv/linux/generic/unlink.c
index 7908d0a..8df5575 100644
--- a/sysdeps/unix/sysv/linux/generic/unlink.c
+++ b/sysdeps/unix/sysv/linux/generic/unlink.c
@@ -16,11 +16,9 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
#include <unistd.h>
#include <fcntl.h>
-
+#include <sysdep.h>
/* Remove the link named NAME. */
int
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c
index 93d9d94..f80b56b 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c
@@ -16,10 +16,10 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <sys/statfs.h>
#include <kernel_stat.h>
#include <stddef.h>
+#include <sysdep.h>
#if !STATFS_IS_STATFS64
#include "overflow.h"
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h b/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h
index c5e0286..e200f63 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h
@@ -19,6 +19,7 @@
#include <sys/stat.h>
#include <sys/statfs.h>
+#include <sys/types.h>
/* Test for overflows of structures where we ask the kernel to fill them
in with standard 64-bit syscalls but return them through APIs that
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/sendfile.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/sendfile.c
index c556a37..72e2d49 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/sendfile.c
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/sendfile.c
@@ -17,7 +17,9 @@
<https://www.gnu.org/licenses/>. */
#include <sys/sendfile.h>
+#include <stddef.h>
#include <errno.h>
+#include <sysdep.h>
/* Send COUNT bytes from file associated with IN_FD starting at OFFSET to
descriptor OUT_FD. */
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c
index 7421501..4484341 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c
@@ -19,7 +19,7 @@
#include <errno.h>
#include <sys/statfs.h>
#include <kernel_stat.h>
-#include <stddef.h>
+#include <sysdep.h>
#if !STATFS_IS_STATFS64
#include "overflow.h"
diff --git a/sysdeps/unix/sysv/linux/getentropy.c b/sysdeps/unix/sysv/linux/getentropy.c
index 2f3a4e4..02cf46f 100644
--- a/sysdeps/unix/sysv/linux/getentropy.c
+++ b/sysdeps/unix/sysv/linux/getentropy.c
@@ -20,6 +20,7 @@
#include <assert.h>
#include <errno.h>
#include <unistd.h>
+#include <sysdep.h>
/* Write LENGTH bytes of randomness starting at BUFFER. Return 0 on
success and -1 on failure. */
diff --git a/sysdeps/unix/sysv/linux/getrlimit.c b/sysdeps/unix/sysv/linux/getrlimit.c
index ecb34dd..339d943 100644
--- a/sysdeps/unix/sysv/linux/getrlimit.c
+++ b/sysdeps/unix/sysv/linux/getrlimit.c
@@ -16,9 +16,8 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <sys/resource.h>
-#include <sys/types.h>
+#include <sysdep.h>
#include <shlib-compat.h>
#if !__RLIM_T_MATCHES_RLIM64_T
diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c
index 0f9a2f4..e06ffd1 100644
--- a/sysdeps/unix/sysv/linux/getrlimit64.c
+++ b/sysdeps/unix/sysv/linux/getrlimit64.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <sys/types.h>
+#include <sysdep.h>
#include <shlib-compat.h>
/* Add this redirection so the strong_alias for __RLIM_T_MATCHES_RLIM64_T
diff --git a/sysdeps/unix/sysv/linux/gettimeofday.c b/sysdeps/unix/sysv/linux/gettimeofday.c
index cb57bc9..1c92e6d 100644
--- a/sysdeps/unix/sysv/linux/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/gettimeofday.c
@@ -16,15 +16,16 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
+#include <time.h>
+#include <string.h>
+
/* Optimize the function call by setting the PLT directly to vDSO symbol. */
#ifdef USE_IFUNC_GETTIMEOFDAY
-# include <time.h>
-# include <string.h>
# include <sysdep.h>
# include <sysdep-vdso.h>
# ifdef SHARED
-# include <dl-vdso.h>
+# include <dl-vdso.h>
# include <libc-vdso.h>
static int
diff --git a/sysdeps/unix/sysv/linux/hppa/sysdep.h b/sysdeps/unix/sysv/linux/hppa/sysdep.h
index 7f8da30..531fe2b 100644
--- a/sysdeps/unix/sysv/linux/hppa/sysdep.h
+++ b/sysdeps/unix/sysv/linux/hppa/sysdep.h
@@ -28,6 +28,8 @@
/* Defines RTLD_PRIVATE_ERRNO. */
#include <dl-sysdep.h>
+#include <tls.h>
+
/* In order to get __set_errno() definition in INLINE_SYSCALL. */
#ifndef __ASSEMBLER__
#include <errno.h>
diff --git a/sysdeps/unix/sysv/linux/internal-signals.h b/sysdeps/unix/sysv/linux/internal-signals.h
index 35f2de0..8455ca8 100644
--- a/sysdeps/unix/sysv/linux/internal-signals.h
+++ b/sysdeps/unix/sysv/linux/internal-signals.h
@@ -23,6 +23,7 @@
#include <sigsetops.h>
#include <stdbool.h>
#include <limits.h>
+#include <stddef.h>
#include <sysdep.h>
/* The signal used for asynchronous cancelation. */
diff --git a/sysdeps/unix/sysv/linux/libc_fatal.c b/sysdeps/unix/sysv/linux/libc_fatal.c
index 7e22c0f..6f568ee 100644
--- a/sysdeps/unix/sysv/linux/libc_fatal.c
+++ b/sysdeps/unix/sysv/linux/libc_fatal.c
@@ -18,6 +18,8 @@
#include <errno.h>
#include <sys/uio.h>
+#include <stdbool.h>
+#include <sysdep.h>
static bool
writev_for_fatal (int fd, const struct iovec *iov, size_t niov, size_t total)
diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep.h b/sysdeps/unix/sysv/linux/microblaze/sysdep.h
index d500172..6fd96ad 100644
--- a/sysdeps/unix/sysv/linux/microblaze/sysdep.h
+++ b/sysdeps/unix/sysv/linux/microblaze/sysdep.h
@@ -26,6 +26,8 @@
/* Defines RTLD_PRIVATE_ERRNO. */
#include <dl-sysdep.h>
+#include <tls.h>
+
/* In order to get __set_errno() definition in INLINE_SYSCALL. */
#ifndef __ASSEMBLER__
# include <errno.h>
diff --git a/sysdeps/unix/sysv/linux/mknodat.c b/sysdeps/unix/sysv/linux/mknodat.c
index fdb8f19..279a440 100644
--- a/sysdeps/unix/sysv/linux/mknodat.c
+++ b/sysdeps/unix/sysv/linux/mknodat.c
@@ -19,6 +19,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
+#include <sysdep.h>
int
__mknodat (int fd, const char *path, mode_t mode, dev_t dev)
diff --git a/sysdeps/unix/sysv/linux/netlink_assert_response.c b/sysdeps/unix/sysv/linux/netlink_assert_response.c
index 5fc0920..5bacf73 100644
--- a/sysdeps/unix/sysv/linux/netlink_assert_response.c
+++ b/sysdeps/unix/sysv/linux/netlink_assert_response.c
@@ -19,6 +19,7 @@
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
+#include <stdbool.h>
#include <sys/socket.h>
#include "netlinkaccess.h"
diff --git a/sysdeps/unix/sysv/linux/posix_fadvise64.c b/sysdeps/unix/sysv/linux/posix_fadvise64.c
index 9787ab4..7323c82 100644
--- a/sysdeps/unix/sysv/linux/posix_fadvise64.c
+++ b/sysdeps/unix/sysv/linux/posix_fadvise64.c
@@ -17,6 +17,7 @@
#include <errno.h>
#include <fcntl.h>
+#include <sysdep.h>
#include <shlib-compat.h>
int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise);
diff --git a/sysdeps/unix/sysv/linux/prlimit.c b/sysdeps/unix/sysv/linux/prlimit.c
index aa74a52..e12eb4e 100644
--- a/sysdeps/unix/sysv/linux/prlimit.c
+++ b/sysdeps/unix/sysv/linux/prlimit.c
@@ -15,10 +15,8 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <sys/resource.h>
-#include <sys/syscall.h>
-
+#include <sysdep.h>
int
prlimit (__pid_t pid, enum __rlimit_resource resource,
diff --git a/sysdeps/unix/sysv/linux/readahead.c b/sysdeps/unix/sysv/linux/readahead.c
index a189c3a..ad01a0a 100644
--- a/sysdeps/unix/sysv/linux/readahead.c
+++ b/sysdeps/unix/sysv/linux/readahead.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <fcntl.h>
-#include <errno.h>
+#include <sys/types.h>
#include <sysdep.h>
ssize_t
diff --git a/sysdeps/unix/sysv/linux/riscv/sysconf.c b/sysdeps/unix/sysv/linux/riscv/sysconf.c
index 02b469c..5a99577 100644
--- a/sysdeps/unix/sysv/linux/riscv/sysconf.c
+++ b/sysdeps/unix/sysv/linux/riscv/sysconf.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <unistd.h>
#include <sys/auxv.h>
+#include <stdbool.h>
static long int linux_sysconf (int name);
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c b/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c
index e4b8251..fa4b244 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c
@@ -19,7 +19,7 @@
#include <sys/types.h>
#include <utmp.h>
#include <errno.h>
-#include <libc-symbols.h>
+#include <stdlib.h>
#include "utmp32.h"
#include "utmp-convert.h"
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c
index 3f78fa6..bdfe396 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c
@@ -19,7 +19,7 @@
#include <sys/types.h>
#include <utmp.h>
#include <errno.h>
-#include <libc-symbols.h>
+#include <stdlib.h>
#include "utmp32.h"
#include "utmp-convert.h"
diff --git a/sysdeps/unix/sysv/linux/semop.c b/sysdeps/unix/sysv/linux/semop.c
index e955f0c..ab790ea 100644
--- a/sysdeps/unix/sysv/linux/semop.c
+++ b/sysdeps/unix/sysv/linux/semop.c
@@ -17,9 +17,9 @@
<https://www.gnu.org/licenses/>. */
#include <sys/sem.h>
+#include <stddef.h>
#include <ipc_priv.h>
#include <sysdep.h>
-#include <errno.h>
/* Perform user-defined atomical operation of array of semaphores. */
diff --git a/sysdeps/unix/sysv/linux/setrlimit.c b/sysdeps/unix/sysv/linux/setrlimit.c
index 8611d57..6648fad 100644
--- a/sysdeps/unix/sysv/linux/setrlimit.c
+++ b/sysdeps/unix/sysv/linux/setrlimit.c
@@ -16,9 +16,8 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
#include <sys/resource.h>
-#include <sys/types.h>
+#include <sysdep.h>
#include <shlib-compat.h>
#if !__RLIM_T_MATCHES_RLIM64_T
diff --git a/sysdeps/unix/sysv/linux/setrlimit64.c b/sysdeps/unix/sysv/linux/setrlimit64.c
index e4c5bab..02c94e3 100644
--- a/sysdeps/unix/sysv/linux/setrlimit64.c
+++ b/sysdeps/unix/sysv/linux/setrlimit64.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <sys/types.h>
+#include <sysdep.h>
#include <shlib-compat.h>
/* Add this redirection so the strong_alias for __RLIM_T_MATCHES_RLIM64_T
diff --git a/sysdeps/unix/sysv/linux/settimezone.c b/sysdeps/unix/sysv/linux/settimezone.c
index fa46386..1639562 100644
--- a/sysdeps/unix/sysv/linux/settimezone.c
+++ b/sysdeps/unix/sysv/linux/settimezone.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <sys/time.h>
+#include <stddef.h>
#include <sysdep.h>
/* Set the system-wide timezone.
diff --git a/sysdeps/unix/sysv/linux/shmget.c b/sysdeps/unix/sysv/linux/shmget.c
index 71de81c..6ea7883 100644
--- a/sysdeps/unix/sysv/linux/shmget.c
+++ b/sysdeps/unix/sysv/linux/shmget.c
@@ -16,9 +16,10 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
+#include <sys/msg.h>
+#include <stddef.h>
#include <ipc_priv.h>
#include <sysdep.h>
-#include <errno.h>
/* Return an identifier for an shared memory segment of at least size SIZE
which is associated with KEY. */
diff --git a/sysdeps/unix/sysv/linux/socketcall.h b/sysdeps/unix/sysv/linux/socketcall.h
index 75c2a64..b9975f9 100644
--- a/sysdeps/unix/sysv/linux/socketcall.h
+++ b/sysdeps/unix/sysv/linux/socketcall.h
@@ -19,6 +19,8 @@
#ifndef _SYS_SOCKETCALL_H
#define _SYS_SOCKETCALL_H 1
+#include <sysdep.h>
+
/* Define unique numbers for the operations permitted on socket. Linux
uses a single system call for all these functions. The relevant code
file is /usr/include/linux/net.h.
diff --git a/sysdeps/unix/sysv/linux/speed.c b/sysdeps/unix/sysv/linux/speed.c
index c02a06a..d7d74dd 100644
--- a/sysdeps/unix/sysv/linux/speed.c
+++ b/sysdeps/unix/sysv/linux/speed.c
@@ -19,7 +19,7 @@
#include <stddef.h>
#include <errno.h>
#include <termios.h>
-
+#include <sysdep.h>
/* This is a gross hack around a kernel bug. If the cfsetispeed functions
is called with the SPEED argument set to zero this means use the same
diff --git a/sysdeps/unix/sysv/linux/statx.c b/sysdeps/unix/sysv/linux/statx.c
index 9721fc1..cea6eef 100644
--- a/sysdeps/unix/sysv/linux/statx.c
+++ b/sysdeps/unix/sysv/linux/statx.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include <sys/stat.h>
-
+#include <sysdep.h>
#include "statx_generic.c"
int
diff --git a/sysdeps/unix/sysv/linux/sysctl.c b/sysdeps/unix/sysv/linux/sysctl.c
index 389b958..479ba38 100644
--- a/sysdeps/unix/sysv/linux/sysctl.c
+++ b/sysdeps/unix/sysv/linux/sysctl.c
@@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <errno.h>
+#include <stddef.h>
#include <shlib-compat.h>
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_32)
diff --git a/sysdeps/unix/sysv/linux/sysdep.h b/sysdeps/unix/sysv/linux/sysdep.h
index 5e7b6c5..71ecc19 100644
--- a/sysdeps/unix/sysv/linux/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sysdep.h
@@ -20,6 +20,7 @@
#include <bits/wordsize.h>
#include <kernel-features.h>
+#include <endian.h>
#include <errno.h>
#undef INTERNAL_SYSCALL_ERROR_P
diff --git a/sysdeps/unix/sysv/linux/truncate64.c b/sysdeps/unix/sysv/linux/truncate64.c
index d4b4657..ac43a2b 100644
--- a/sysdeps/unix/sysv/linux/truncate64.c
+++ b/sysdeps/unix/sysv/linux/truncate64.c
@@ -17,7 +17,6 @@
#include <unistd.h>
#include <sysdep.h>
-#include <errno.h>
#ifndef __NR_truncate64
# define __NR_truncate64 __NR_truncate
diff --git a/sysdeps/unix/sysv/linux/ustat.c b/sysdeps/unix/sysv/linux/ustat.c
index 51f20a2..e38b792 100644
--- a/sysdeps/unix/sysv/linux/ustat.c
+++ b/sysdeps/unix/sysv/linux/ustat.c
@@ -23,7 +23,7 @@
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_28)
# include <sysdep.h>
-# include <errno.h>
+# include <sys/types.h>
# ifndef DEV_TO_KDEV
# define DEV_TO_KDEV(__dev) \
diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c
index 82bb0bd..10e874a 100644
--- a/sysdeps/unix/sysv/linux/xmknod.c
+++ b/sysdeps/unix/sysv/linux/xmknod.c
@@ -19,6 +19,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
+#include <sysdep.h>
#include <shlib-compat.h>
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33)
diff --git a/sysdeps/unix/sysv/linux/xmknodat.c b/sysdeps/unix/sysv/linux/xmknodat.c
index fae3fe5..17ffea1 100644
--- a/sysdeps/unix/sysv/linux/xmknodat.c
+++ b/sysdeps/unix/sysv/linux/xmknodat.c
@@ -17,6 +17,7 @@
#include <sys/stat.h>
#include <errno.h>
+#include <sysdep.h>
#include <shlib-compat.h>
#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33)
diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c
index 3622a82..b100e07 100644
--- a/sysdeps/unix/sysv/linux/xstatconv.c
+++ b/sysdeps/unix/sysv/linux/xstatconv.c
@@ -19,6 +19,7 @@
#include <errno.h>
#include <sys/stat.h>
#include <kernel_stat.h>
+#include <sysdep.h>
#if STAT_IS_KERNEL_STAT
diff --git a/sysdeps/x86_64/stackinfo.h b/sysdeps/x86_64/stackinfo.h
index 7bcb3b1..4a4e54c 100644
--- a/sysdeps/x86_64/stackinfo.h
+++ b/sysdeps/x86_64/stackinfo.h
@@ -23,6 +23,12 @@
#include <elf.h>
+#ifdef __ILP32__
+# define RSP_REG "esp"
+#else
+# define RSP_REG "rsp"
+#endif
+
/* On x86_64 the stack grows down. */
#define _STACK_GROWS_DOWN 1
@@ -34,10 +40,10 @@
for which they need to act as barriers as well, hence the additional
(unnecessary) parameters. */
#define stackinfo_get_sp() \
- ({ void *p__; asm volatile ("mov %%" RSP_LP ", %0" : "=r" (p__)); p__; })
+ ({ void *p__; asm volatile ("mov %%" RSP_REG ", %0" : "=r" (p__)); p__; })
#define stackinfo_sub_sp(ptr) \
({ ptrdiff_t d__; \
- asm volatile ("sub %%" RSP_LP " , %0" : "=r" (d__) : "0" (ptr)); \
+ asm volatile ("sub %%" RSP_REG " , %0" : "=r" (d__) : "0" (ptr)); \
d__; })
#endif /* stackinfo.h */