aboutsummaryrefslogtreecommitdiffstats
path: root/libc/arch-arm/syscalls
diff options
context:
space:
mode:
Diffstat (limited to 'libc/arch-arm/syscalls')
-rw-r--r--libc/arch-arm/syscalls/__brk.S4
-rw-r--r--libc/arch-arm/syscalls/__clone.S4
-rw-r--r--libc/arch-arm/syscalls/__epoll_pwait.S4
-rw-r--r--libc/arch-arm/syscalls/__exit.S4
-rw-r--r--libc/arch-arm/syscalls/__fcntl64.S4
-rw-r--r--libc/arch-arm/syscalls/__fstatfs64.S4
-rw-r--r--libc/arch-arm/syscalls/__getcpu.S4
-rw-r--r--libc/arch-arm/syscalls/__getcwd.S4
-rw-r--r--libc/arch-arm/syscalls/__getpriority.S4
-rw-r--r--libc/arch-arm/syscalls/__ioctl.S4
-rw-r--r--libc/arch-arm/syscalls/__llseek.S4
-rw-r--r--libc/arch-arm/syscalls/__mmap2.S4
-rw-r--r--libc/arch-arm/syscalls/__openat.S4
-rw-r--r--libc/arch-arm/syscalls/__ppoll.S4
-rw-r--r--libc/arch-arm/syscalls/__pselect6.S4
-rw-r--r--libc/arch-arm/syscalls/__ptrace.S4
-rw-r--r--libc/arch-arm/syscalls/__reboot.S4
-rw-r--r--libc/arch-arm/syscalls/__rt_sigaction.S4
-rw-r--r--libc/arch-arm/syscalls/__rt_sigpending.S4
-rw-r--r--libc/arch-arm/syscalls/__rt_sigprocmask.S4
-rw-r--r--libc/arch-arm/syscalls/__rt_sigsuspend.S4
-rw-r--r--libc/arch-arm/syscalls/__rt_sigtimedwait.S4
-rw-r--r--libc/arch-arm/syscalls/__sched_getaffinity.S4
-rw-r--r--libc/arch-arm/syscalls/__set_tls.S4
-rw-r--r--libc/arch-arm/syscalls/__sigaction.S4
-rw-r--r--libc/arch-arm/syscalls/__statfs64.S4
-rw-r--r--libc/arch-arm/syscalls/__syslog.S4
-rw-r--r--libc/arch-arm/syscalls/__timer_create.S4
-rw-r--r--libc/arch-arm/syscalls/__timer_delete.S4
-rw-r--r--libc/arch-arm/syscalls/__timer_getoverrun.S4
-rw-r--r--libc/arch-arm/syscalls/__timer_gettime.S4
-rw-r--r--libc/arch-arm/syscalls/__timer_settime.S4
-rw-r--r--libc/arch-arm/syscalls/__waitid.S4
-rw-r--r--libc/arch-arm/syscalls/_exit.S4
-rw-r--r--libc/arch-arm/syscalls/accept.S4
-rw-r--r--libc/arch-arm/syscalls/acct.S4
-rw-r--r--libc/arch-arm/syscalls/bind.S4
-rw-r--r--libc/arch-arm/syscalls/cacheflush.S4
-rw-r--r--libc/arch-arm/syscalls/capget.S4
-rw-r--r--libc/arch-arm/syscalls/capset.S4
-rw-r--r--libc/arch-arm/syscalls/chdir.S4
-rw-r--r--libc/arch-arm/syscalls/chroot.S4
-rw-r--r--libc/arch-arm/syscalls/clock_getres.S4
-rw-r--r--libc/arch-arm/syscalls/clock_gettime.S4
-rw-r--r--libc/arch-arm/syscalls/clock_nanosleep.S4
-rw-r--r--libc/arch-arm/syscalls/clock_settime.S4
-rw-r--r--libc/arch-arm/syscalls/close.S4
-rw-r--r--libc/arch-arm/syscalls/connect.S4
-rw-r--r--libc/arch-arm/syscalls/delete_module.S4
-rw-r--r--libc/arch-arm/syscalls/dup.S4
-rw-r--r--libc/arch-arm/syscalls/dup3.S4
-rw-r--r--libc/arch-arm/syscalls/epoll_create1.S4
-rw-r--r--libc/arch-arm/syscalls/epoll_ctl.S4
-rw-r--r--libc/arch-arm/syscalls/eventfd.S4
-rw-r--r--libc/arch-arm/syscalls/execve.S4
-rw-r--r--libc/arch-arm/syscalls/faccessat.S4
-rw-r--r--libc/arch-arm/syscalls/fchdir.S4
-rw-r--r--libc/arch-arm/syscalls/fchmod.S4
-rw-r--r--libc/arch-arm/syscalls/fchmodat.S4
-rw-r--r--libc/arch-arm/syscalls/fchown.S4
-rw-r--r--libc/arch-arm/syscalls/fchownat.S4
-rw-r--r--libc/arch-arm/syscalls/fdatasync.S4
-rw-r--r--libc/arch-arm/syscalls/fgetxattr.S4
-rw-r--r--libc/arch-arm/syscalls/flistxattr.S4
-rw-r--r--libc/arch-arm/syscalls/flock.S4
-rw-r--r--libc/arch-arm/syscalls/fremovexattr.S4
-rw-r--r--libc/arch-arm/syscalls/fsetxattr.S4
-rw-r--r--libc/arch-arm/syscalls/fstat.S4
-rw-r--r--libc/arch-arm/syscalls/fstatat.S4
-rw-r--r--libc/arch-arm/syscalls/fsync.S4
-rw-r--r--libc/arch-arm/syscalls/ftruncate.S4
-rw-r--r--libc/arch-arm/syscalls/ftruncate64.S4
-rw-r--r--libc/arch-arm/syscalls/futex.S4
-rw-r--r--libc/arch-arm/syscalls/getdents.S4
-rw-r--r--libc/arch-arm/syscalls/getegid.S4
-rw-r--r--libc/arch-arm/syscalls/geteuid.S4
-rw-r--r--libc/arch-arm/syscalls/getgid.S4
-rw-r--r--libc/arch-arm/syscalls/getgroups.S4
-rw-r--r--libc/arch-arm/syscalls/getitimer.S4
-rw-r--r--libc/arch-arm/syscalls/getpeername.S4
-rw-r--r--libc/arch-arm/syscalls/getpgid.S4
-rw-r--r--libc/arch-arm/syscalls/getpid.S4
-rw-r--r--libc/arch-arm/syscalls/getppid.S4
-rw-r--r--libc/arch-arm/syscalls/getresgid.S4
-rw-r--r--libc/arch-arm/syscalls/getresuid.S4
-rw-r--r--libc/arch-arm/syscalls/getrlimit.S4
-rw-r--r--libc/arch-arm/syscalls/getrusage.S4
-rw-r--r--libc/arch-arm/syscalls/getsid.S4
-rw-r--r--libc/arch-arm/syscalls/getsockname.S4
-rw-r--r--libc/arch-arm/syscalls/getsockopt.S4
-rw-r--r--libc/arch-arm/syscalls/gettid.S4
-rw-r--r--libc/arch-arm/syscalls/gettimeofday.S4
-rw-r--r--libc/arch-arm/syscalls/getuid.S4
-rw-r--r--libc/arch-arm/syscalls/getxattr.S4
-rw-r--r--libc/arch-arm/syscalls/init_module.S4
-rw-r--r--libc/arch-arm/syscalls/inotify_add_watch.S4
-rw-r--r--libc/arch-arm/syscalls/inotify_init1.S4
-rw-r--r--libc/arch-arm/syscalls/inotify_rm_watch.S4
-rw-r--r--libc/arch-arm/syscalls/ioprio_get.S4
-rw-r--r--libc/arch-arm/syscalls/ioprio_set.S4
-rw-r--r--libc/arch-arm/syscalls/klogctl.S4
-rw-r--r--libc/arch-arm/syscalls/lgetxattr.S4
-rw-r--r--libc/arch-arm/syscalls/linkat.S4
-rw-r--r--libc/arch-arm/syscalls/listen.S4
-rw-r--r--libc/arch-arm/syscalls/listxattr.S4
-rw-r--r--libc/arch-arm/syscalls/llistxattr.S4
-rw-r--r--libc/arch-arm/syscalls/lremovexattr.S4
-rw-r--r--libc/arch-arm/syscalls/lseek.S4
-rw-r--r--libc/arch-arm/syscalls/lsetxattr.S4
-rw-r--r--libc/arch-arm/syscalls/madvise.S4
-rw-r--r--libc/arch-arm/syscalls/mincore.S4
-rw-r--r--libc/arch-arm/syscalls/mkdirat.S4
-rw-r--r--libc/arch-arm/syscalls/mknodat.S4
-rw-r--r--libc/arch-arm/syscalls/mlock.S4
-rw-r--r--libc/arch-arm/syscalls/mlockall.S4
-rw-r--r--libc/arch-arm/syscalls/mount.S4
-rw-r--r--libc/arch-arm/syscalls/mprotect.S4
-rw-r--r--libc/arch-arm/syscalls/mremap.S4
-rw-r--r--libc/arch-arm/syscalls/msync.S4
-rw-r--r--libc/arch-arm/syscalls/munlock.S4
-rw-r--r--libc/arch-arm/syscalls/munlockall.S4
-rw-r--r--libc/arch-arm/syscalls/munmap.S4
-rw-r--r--libc/arch-arm/syscalls/nanosleep.S4
-rw-r--r--libc/arch-arm/syscalls/perf_event_open.S4
-rw-r--r--libc/arch-arm/syscalls/personality.S4
-rw-r--r--libc/arch-arm/syscalls/pipe2.S4
-rw-r--r--libc/arch-arm/syscalls/prctl.S4
-rw-r--r--libc/arch-arm/syscalls/pread64.S4
-rw-r--r--libc/arch-arm/syscalls/pwrite64.S4
-rw-r--r--libc/arch-arm/syscalls/read.S4
-rw-r--r--libc/arch-arm/syscalls/readahead.S4
-rw-r--r--libc/arch-arm/syscalls/readlinkat.S4
-rw-r--r--libc/arch-arm/syscalls/readv.S4
-rw-r--r--libc/arch-arm/syscalls/recvfrom.S4
-rw-r--r--libc/arch-arm/syscalls/recvmsg.S4
-rw-r--r--libc/arch-arm/syscalls/removexattr.S4
-rw-r--r--libc/arch-arm/syscalls/renameat.S4
-rw-r--r--libc/arch-arm/syscalls/sched_get_priority_max.S4
-rw-r--r--libc/arch-arm/syscalls/sched_get_priority_min.S4
-rw-r--r--libc/arch-arm/syscalls/sched_getparam.S4
-rw-r--r--libc/arch-arm/syscalls/sched_getscheduler.S4
-rw-r--r--libc/arch-arm/syscalls/sched_rr_get_interval.S4
-rw-r--r--libc/arch-arm/syscalls/sched_setaffinity.S4
-rw-r--r--libc/arch-arm/syscalls/sched_setparam.S4
-rw-r--r--libc/arch-arm/syscalls/sched_setscheduler.S4
-rw-r--r--libc/arch-arm/syscalls/sched_yield.S4
-rw-r--r--libc/arch-arm/syscalls/sendfile.S4
-rw-r--r--libc/arch-arm/syscalls/sendfile64.S4
-rw-r--r--libc/arch-arm/syscalls/sendmsg.S4
-rw-r--r--libc/arch-arm/syscalls/sendto.S4
-rw-r--r--libc/arch-arm/syscalls/setgid.S4
-rw-r--r--libc/arch-arm/syscalls/setgroups.S4
-rw-r--r--libc/arch-arm/syscalls/setitimer.S4
-rw-r--r--libc/arch-arm/syscalls/setpgid.S4
-rw-r--r--libc/arch-arm/syscalls/setpriority.S4
-rw-r--r--libc/arch-arm/syscalls/setregid.S4
-rw-r--r--libc/arch-arm/syscalls/setresgid.S4
-rw-r--r--libc/arch-arm/syscalls/setresuid.S4
-rw-r--r--libc/arch-arm/syscalls/setreuid.S4
-rw-r--r--libc/arch-arm/syscalls/setrlimit.S4
-rw-r--r--libc/arch-arm/syscalls/setsid.S4
-rw-r--r--libc/arch-arm/syscalls/setsockopt.S4
-rw-r--r--libc/arch-arm/syscalls/settimeofday.S4
-rw-r--r--libc/arch-arm/syscalls/setuid.S4
-rw-r--r--libc/arch-arm/syscalls/setxattr.S4
-rw-r--r--libc/arch-arm/syscalls/shutdown.S4
-rw-r--r--libc/arch-arm/syscalls/sigaltstack.S4
-rw-r--r--libc/arch-arm/syscalls/signalfd4.S4
-rw-r--r--libc/arch-arm/syscalls/socket.S4
-rw-r--r--libc/arch-arm/syscalls/socketpair.S4
-rw-r--r--libc/arch-arm/syscalls/swapoff.S4
-rw-r--r--libc/arch-arm/syscalls/swapon.S4
-rw-r--r--libc/arch-arm/syscalls/symlinkat.S4
-rw-r--r--libc/arch-arm/syscalls/sync.S4
-rw-r--r--libc/arch-arm/syscalls/sysinfo.S4
-rw-r--r--libc/arch-arm/syscalls/timerfd_create.S4
-rw-r--r--libc/arch-arm/syscalls/timerfd_gettime.S4
-rw-r--r--libc/arch-arm/syscalls/timerfd_settime.S4
-rw-r--r--libc/arch-arm/syscalls/times.S4
-rw-r--r--libc/arch-arm/syscalls/truncate.S4
-rw-r--r--libc/arch-arm/syscalls/truncate64.S4
-rw-r--r--libc/arch-arm/syscalls/umask.S4
-rw-r--r--libc/arch-arm/syscalls/umount2.S4
-rw-r--r--libc/arch-arm/syscalls/uname.S4
-rw-r--r--libc/arch-arm/syscalls/unlinkat.S4
-rw-r--r--libc/arch-arm/syscalls/unshare.S4
-rw-r--r--libc/arch-arm/syscalls/utimensat.S4
-rw-r--r--libc/arch-arm/syscalls/vfork.S4
-rw-r--r--libc/arch-arm/syscalls/wait4.S4
-rw-r--r--libc/arch-arm/syscalls/write.S4
-rw-r--r--libc/arch-arm/syscalls/writev.S4
191 files changed, 191 insertions, 573 deletions
diff --git a/libc/arch-arm/syscalls/__brk.S b/libc/arch-arm/syscalls/__brk.S
index 8ba636bd6..31de0d237 100644
--- a/libc/arch-arm/syscalls/__brk.S
+++ b/libc/arch-arm/syscalls/__brk.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__brk)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__clone.S b/libc/arch-arm/syscalls/__clone.S
index b7ff23bcc..fb074bc26 100644
--- a/libc/arch-arm/syscalls/__clone.S
+++ b/libc/arch-arm/syscalls/__clone.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__clone)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/__epoll_pwait.S b/libc/arch-arm/syscalls/__epoll_pwait.S
index 5eb3dab65..f0b144403 100644
--- a/libc/arch-arm/syscalls/__epoll_pwait.S
+++ b/libc/arch-arm/syscalls/__epoll_pwait.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__epoll_pwait)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/__exit.S b/libc/arch-arm/syscalls/__exit.S
index 8cdd0fa3f..c534bb05d 100644
--- a/libc/arch-arm/syscalls/__exit.S
+++ b/libc/arch-arm/syscalls/__exit.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__exit)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__fcntl64.S b/libc/arch-arm/syscalls/__fcntl64.S
index 4ca0c2c67..2132cb736 100644
--- a/libc/arch-arm/syscalls/__fcntl64.S
+++ b/libc/arch-arm/syscalls/__fcntl64.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__fcntl64)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__fstatfs64.S b/libc/arch-arm/syscalls/__fstatfs64.S
index ec34cd201..18942bc8a 100644
--- a/libc/arch-arm/syscalls/__fstatfs64.S
+++ b/libc/arch-arm/syscalls/__fstatfs64.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__fstatfs64)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__getcpu.S b/libc/arch-arm/syscalls/__getcpu.S
index 4836ff030..1aea50a6a 100644
--- a/libc/arch-arm/syscalls/__getcpu.S
+++ b/libc/arch-arm/syscalls/__getcpu.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__getcpu)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__getcwd.S b/libc/arch-arm/syscalls/__getcwd.S
index 81e500980..1c2ac6c53 100644
--- a/libc/arch-arm/syscalls/__getcwd.S
+++ b/libc/arch-arm/syscalls/__getcwd.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__getcwd)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__getpriority.S b/libc/arch-arm/syscalls/__getpriority.S
index e69a69996..90ccaea80 100644
--- a/libc/arch-arm/syscalls/__getpriority.S
+++ b/libc/arch-arm/syscalls/__getpriority.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__getpriority)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__ioctl.S b/libc/arch-arm/syscalls/__ioctl.S
index 26b02ce8c..3f816db8c 100644
--- a/libc/arch-arm/syscalls/__ioctl.S
+++ b/libc/arch-arm/syscalls/__ioctl.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__ioctl)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__llseek.S b/libc/arch-arm/syscalls/__llseek.S
index b4407076b..5d215a448 100644
--- a/libc/arch-arm/syscalls/__llseek.S
+++ b/libc/arch-arm/syscalls/__llseek.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__llseek)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/__mmap2.S b/libc/arch-arm/syscalls/__mmap2.S
index c2d53a555..c8dec862a 100644
--- a/libc/arch-arm/syscalls/__mmap2.S
+++ b/libc/arch-arm/syscalls/__mmap2.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__mmap2)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/__openat.S b/libc/arch-arm/syscalls/__openat.S
index a1310c93b..7a38dc3b1 100644
--- a/libc/arch-arm/syscalls/__openat.S
+++ b/libc/arch-arm/syscalls/__openat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__openat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__ppoll.S b/libc/arch-arm/syscalls/__ppoll.S
index 7b833ac1b..599217879 100644
--- a/libc/arch-arm/syscalls/__ppoll.S
+++ b/libc/arch-arm/syscalls/__ppoll.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__ppoll)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/__pselect6.S b/libc/arch-arm/syscalls/__pselect6.S
index 44e22eecb..d44e7ed58 100644
--- a/libc/arch-arm/syscalls/__pselect6.S
+++ b/libc/arch-arm/syscalls/__pselect6.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__pselect6)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/__ptrace.S b/libc/arch-arm/syscalls/__ptrace.S
index d7ccd44b0..4e41d9d15 100644
--- a/libc/arch-arm/syscalls/__ptrace.S
+++ b/libc/arch-arm/syscalls/__ptrace.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__ptrace)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__reboot.S b/libc/arch-arm/syscalls/__reboot.S
index bda9f7446..18e29a763 100644
--- a/libc/arch-arm/syscalls/__reboot.S
+++ b/libc/arch-arm/syscalls/__reboot.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__reboot)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__rt_sigaction.S b/libc/arch-arm/syscalls/__rt_sigaction.S
index 0b01f37f2..974c0e205 100644
--- a/libc/arch-arm/syscalls/__rt_sigaction.S
+++ b/libc/arch-arm/syscalls/__rt_sigaction.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__rt_sigaction)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__rt_sigpending.S b/libc/arch-arm/syscalls/__rt_sigpending.S
index efaecc1ca..4a0f5d7f7 100644
--- a/libc/arch-arm/syscalls/__rt_sigpending.S
+++ b/libc/arch-arm/syscalls/__rt_sigpending.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__rt_sigpending)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__rt_sigprocmask.S b/libc/arch-arm/syscalls/__rt_sigprocmask.S
index 5345c69db..19abdc196 100644
--- a/libc/arch-arm/syscalls/__rt_sigprocmask.S
+++ b/libc/arch-arm/syscalls/__rt_sigprocmask.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__rt_sigprocmask)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__rt_sigsuspend.S b/libc/arch-arm/syscalls/__rt_sigsuspend.S
index b95313e0b..a0af905bc 100644
--- a/libc/arch-arm/syscalls/__rt_sigsuspend.S
+++ b/libc/arch-arm/syscalls/__rt_sigsuspend.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__rt_sigsuspend)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__rt_sigtimedwait.S b/libc/arch-arm/syscalls/__rt_sigtimedwait.S
index f0bbca58e..0ba7ce290 100644
--- a/libc/arch-arm/syscalls/__rt_sigtimedwait.S
+++ b/libc/arch-arm/syscalls/__rt_sigtimedwait.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__rt_sigtimedwait)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__sched_getaffinity.S b/libc/arch-arm/syscalls/__sched_getaffinity.S
index c2cd07dd7..e977cfb1c 100644
--- a/libc/arch-arm/syscalls/__sched_getaffinity.S
+++ b/libc/arch-arm/syscalls/__sched_getaffinity.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__sched_getaffinity)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__set_tls.S b/libc/arch-arm/syscalls/__set_tls.S
index 9199d3af4..94c7cf4aa 100644
--- a/libc/arch-arm/syscalls/__set_tls.S
+++ b/libc/arch-arm/syscalls/__set_tls.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__set_tls)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__sigaction.S b/libc/arch-arm/syscalls/__sigaction.S
index 23a2b23b3..7e2e07eea 100644
--- a/libc/arch-arm/syscalls/__sigaction.S
+++ b/libc/arch-arm/syscalls/__sigaction.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__sigaction)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__statfs64.S b/libc/arch-arm/syscalls/__statfs64.S
index 65cb0ee61..256356226 100644
--- a/libc/arch-arm/syscalls/__statfs64.S
+++ b/libc/arch-arm/syscalls/__statfs64.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__statfs64)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__syslog.S b/libc/arch-arm/syscalls/__syslog.S
index 4a3b84f11..66e761a3c 100644
--- a/libc/arch-arm/syscalls/__syslog.S
+++ b/libc/arch-arm/syscalls/__syslog.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__syslog)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__timer_create.S b/libc/arch-arm/syscalls/__timer_create.S
index 541602785..9b75749e5 100644
--- a/libc/arch-arm/syscalls/__timer_create.S
+++ b/libc/arch-arm/syscalls/__timer_create.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__timer_create)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__timer_delete.S b/libc/arch-arm/syscalls/__timer_delete.S
index 128f13e38..db32b3bb7 100644
--- a/libc/arch-arm/syscalls/__timer_delete.S
+++ b/libc/arch-arm/syscalls/__timer_delete.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__timer_delete)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__timer_getoverrun.S b/libc/arch-arm/syscalls/__timer_getoverrun.S
index 810dbc86c..5701b12e0 100644
--- a/libc/arch-arm/syscalls/__timer_getoverrun.S
+++ b/libc/arch-arm/syscalls/__timer_getoverrun.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__timer_getoverrun)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__timer_gettime.S b/libc/arch-arm/syscalls/__timer_gettime.S
index 29f5d521f..e9a4ff9b1 100644
--- a/libc/arch-arm/syscalls/__timer_gettime.S
+++ b/libc/arch-arm/syscalls/__timer_gettime.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__timer_gettime)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__timer_settime.S b/libc/arch-arm/syscalls/__timer_settime.S
index ea160eeac..2f1ab190f 100644
--- a/libc/arch-arm/syscalls/__timer_settime.S
+++ b/libc/arch-arm/syscalls/__timer_settime.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__timer_settime)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/__waitid.S b/libc/arch-arm/syscalls/__waitid.S
index 7d7c60912..51b64875b 100644
--- a/libc/arch-arm/syscalls/__waitid.S
+++ b/libc/arch-arm/syscalls/__waitid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(__waitid)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/_exit.S b/libc/arch-arm/syscalls/_exit.S
index c1c97c553..1a6b35dcb 100644
--- a/libc/arch-arm/syscalls/_exit.S
+++ b/libc/arch-arm/syscalls/_exit.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(_exit)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/accept.S b/libc/arch-arm/syscalls/accept.S
index d4aef8ac1..e2a51f5db 100644
--- a/libc/arch-arm/syscalls/accept.S
+++ b/libc/arch-arm/syscalls/accept.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(accept)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/acct.S b/libc/arch-arm/syscalls/acct.S
index c185f7dc4..e360c5ac1 100644
--- a/libc/arch-arm/syscalls/acct.S
+++ b/libc/arch-arm/syscalls/acct.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(acct)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/bind.S b/libc/arch-arm/syscalls/bind.S
index 803e8f94e..e07dd7732 100644
--- a/libc/arch-arm/syscalls/bind.S
+++ b/libc/arch-arm/syscalls/bind.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(bind)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/cacheflush.S b/libc/arch-arm/syscalls/cacheflush.S
index be64959d7..ac2a218a6 100644
--- a/libc/arch-arm/syscalls/cacheflush.S
+++ b/libc/arch-arm/syscalls/cacheflush.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(cacheflush)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/capget.S b/libc/arch-arm/syscalls/capget.S
index 426b615b9..b912830ae 100644
--- a/libc/arch-arm/syscalls/capget.S
+++ b/libc/arch-arm/syscalls/capget.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(capget)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/capset.S b/libc/arch-arm/syscalls/capset.S
index 3a75a37e0..cef68c5e0 100644
--- a/libc/arch-arm/syscalls/capset.S
+++ b/libc/arch-arm/syscalls/capset.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(capset)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/chdir.S b/libc/arch-arm/syscalls/chdir.S
index 236007cbc..ea93fd6e6 100644
--- a/libc/arch-arm/syscalls/chdir.S
+++ b/libc/arch-arm/syscalls/chdir.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(chdir)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/chroot.S b/libc/arch-arm/syscalls/chroot.S
index 100b03654..b1199e6e8 100644
--- a/libc/arch-arm/syscalls/chroot.S
+++ b/libc/arch-arm/syscalls/chroot.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(chroot)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/clock_getres.S b/libc/arch-arm/syscalls/clock_getres.S
index 5c9493cec..f1e7fa294 100644
--- a/libc/arch-arm/syscalls/clock_getres.S
+++ b/libc/arch-arm/syscalls/clock_getres.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(clock_getres)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/clock_gettime.S b/libc/arch-arm/syscalls/clock_gettime.S
index a909affda..9b3e132e2 100644
--- a/libc/arch-arm/syscalls/clock_gettime.S
+++ b/libc/arch-arm/syscalls/clock_gettime.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(clock_gettime)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/clock_nanosleep.S b/libc/arch-arm/syscalls/clock_nanosleep.S
index 809333e3a..fda7394b8 100644
--- a/libc/arch-arm/syscalls/clock_nanosleep.S
+++ b/libc/arch-arm/syscalls/clock_nanosleep.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(clock_nanosleep)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/clock_settime.S b/libc/arch-arm/syscalls/clock_settime.S
index 4730109c3..5a0059e54 100644
--- a/libc/arch-arm/syscalls/clock_settime.S
+++ b/libc/arch-arm/syscalls/clock_settime.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(clock_settime)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/close.S b/libc/arch-arm/syscalls/close.S
index 0001c0276..00c8f85dc 100644
--- a/libc/arch-arm/syscalls/close.S
+++ b/libc/arch-arm/syscalls/close.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(close)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/connect.S b/libc/arch-arm/syscalls/connect.S
index a92dcb4ca..f7a518876 100644
--- a/libc/arch-arm/syscalls/connect.S
+++ b/libc/arch-arm/syscalls/connect.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(connect)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/delete_module.S b/libc/arch-arm/syscalls/delete_module.S
index f7bbe06ec..a26b47857 100644
--- a/libc/arch-arm/syscalls/delete_module.S
+++ b/libc/arch-arm/syscalls/delete_module.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(delete_module)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/dup.S b/libc/arch-arm/syscalls/dup.S
index d30ce880e..b1859d9e5 100644
--- a/libc/arch-arm/syscalls/dup.S
+++ b/libc/arch-arm/syscalls/dup.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(dup)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/dup3.S b/libc/arch-arm/syscalls/dup3.S
index ad212548f..3e47c10a2 100644
--- a/libc/arch-arm/syscalls/dup3.S
+++ b/libc/arch-arm/syscalls/dup3.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(dup3)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/epoll_create1.S b/libc/arch-arm/syscalls/epoll_create1.S
index 95715516f..2eebc0cd1 100644
--- a/libc/arch-arm/syscalls/epoll_create1.S
+++ b/libc/arch-arm/syscalls/epoll_create1.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(epoll_create1)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/epoll_ctl.S b/libc/arch-arm/syscalls/epoll_ctl.S
index ccd531a3b..7a1cc41da 100644
--- a/libc/arch-arm/syscalls/epoll_ctl.S
+++ b/libc/arch-arm/syscalls/epoll_ctl.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(epoll_ctl)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/eventfd.S b/libc/arch-arm/syscalls/eventfd.S
index 55be77dbc..08272d38a 100644
--- a/libc/arch-arm/syscalls/eventfd.S
+++ b/libc/arch-arm/syscalls/eventfd.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(eventfd)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/execve.S b/libc/arch-arm/syscalls/execve.S
index 11fcd1274..361ec6382 100644
--- a/libc/arch-arm/syscalls/execve.S
+++ b/libc/arch-arm/syscalls/execve.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(execve)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/faccessat.S b/libc/arch-arm/syscalls/faccessat.S
index a1709e934..c82b2ce4e 100644
--- a/libc/arch-arm/syscalls/faccessat.S
+++ b/libc/arch-arm/syscalls/faccessat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(faccessat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/fchdir.S b/libc/arch-arm/syscalls/fchdir.S
index 4bf995036..1a7eb5181 100644
--- a/libc/arch-arm/syscalls/fchdir.S
+++ b/libc/arch-arm/syscalls/fchdir.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fchdir)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/fchmod.S b/libc/arch-arm/syscalls/fchmod.S
index 61495dd5d..42dc5b832 100644
--- a/libc/arch-arm/syscalls/fchmod.S
+++ b/libc/arch-arm/syscalls/fchmod.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fchmod)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/fchmodat.S b/libc/arch-arm/syscalls/fchmodat.S
index 676a6a09a..e03da8cd2 100644
--- a/libc/arch-arm/syscalls/fchmodat.S
+++ b/libc/arch-arm/syscalls/fchmodat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fchmodat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/fchown.S b/libc/arch-arm/syscalls/fchown.S
index 77f4e5887..c2c398299 100644
--- a/libc/arch-arm/syscalls/fchown.S
+++ b/libc/arch-arm/syscalls/fchown.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fchown)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/fchownat.S b/libc/arch-arm/syscalls/fchownat.S
index 92860bf58..12a771001 100644
--- a/libc/arch-arm/syscalls/fchownat.S
+++ b/libc/arch-arm/syscalls/fchownat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fchownat)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/fdatasync.S b/libc/arch-arm/syscalls/fdatasync.S
index f4c13c7a4..9c8317d81 100644
--- a/libc/arch-arm/syscalls/fdatasync.S
+++ b/libc/arch-arm/syscalls/fdatasync.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fdatasync)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/fgetxattr.S b/libc/arch-arm/syscalls/fgetxattr.S
index 10ea74a7d..bef536b2c 100644
--- a/libc/arch-arm/syscalls/fgetxattr.S
+++ b/libc/arch-arm/syscalls/fgetxattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fgetxattr)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/flistxattr.S b/libc/arch-arm/syscalls/flistxattr.S
index 3404d7818..d9a30bb80 100644
--- a/libc/arch-arm/syscalls/flistxattr.S
+++ b/libc/arch-arm/syscalls/flistxattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(flistxattr)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/flock.S b/libc/arch-arm/syscalls/flock.S
index b8d4082e0..016e8240b 100644
--- a/libc/arch-arm/syscalls/flock.S
+++ b/libc/arch-arm/syscalls/flock.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(flock)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/fremovexattr.S b/libc/arch-arm/syscalls/fremovexattr.S
index 4b732eee6..c7ff034ff 100644
--- a/libc/arch-arm/syscalls/fremovexattr.S
+++ b/libc/arch-arm/syscalls/fremovexattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fremovexattr)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/fsetxattr.S b/libc/arch-arm/syscalls/fsetxattr.S
index d32594fa0..7f9572083 100644
--- a/libc/arch-arm/syscalls/fsetxattr.S
+++ b/libc/arch-arm/syscalls/fsetxattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fsetxattr)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/fstat.S b/libc/arch-arm/syscalls/fstat.S
index 36e528bc1..cf08d0863 100644
--- a/libc/arch-arm/syscalls/fstat.S
+++ b/libc/arch-arm/syscalls/fstat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fstat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/fstatat.S b/libc/arch-arm/syscalls/fstatat.S
index c8c9aeeec..7cc9bb000 100644
--- a/libc/arch-arm/syscalls/fstatat.S
+++ b/libc/arch-arm/syscalls/fstatat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fstatat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/fsync.S b/libc/arch-arm/syscalls/fsync.S
index cabdc66ff..6b7c4a8ad 100644
--- a/libc/arch-arm/syscalls/fsync.S
+++ b/libc/arch-arm/syscalls/fsync.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(fsync)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/ftruncate.S b/libc/arch-arm/syscalls/ftruncate.S
index 918bc6d46..4a3d56c11 100644
--- a/libc/arch-arm/syscalls/ftruncate.S
+++ b/libc/arch-arm/syscalls/ftruncate.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(ftruncate)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/ftruncate64.S b/libc/arch-arm/syscalls/ftruncate64.S
index 4f251d396..910ca68d3 100644
--- a/libc/arch-arm/syscalls/ftruncate64.S
+++ b/libc/arch-arm/syscalls/ftruncate64.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(ftruncate64)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/futex.S b/libc/arch-arm/syscalls/futex.S
index bfdf7be49..a553b7ea9 100644
--- a/libc/arch-arm/syscalls/futex.S
+++ b/libc/arch-arm/syscalls/futex.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(futex)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/getdents.S b/libc/arch-arm/syscalls/getdents.S
index fa2ef8997..8f0e81afd 100644
--- a/libc/arch-arm/syscalls/getdents.S
+++ b/libc/arch-arm/syscalls/getdents.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getdents)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getegid.S b/libc/arch-arm/syscalls/getegid.S
index fe6f69728..6afca909d 100644
--- a/libc/arch-arm/syscalls/getegid.S
+++ b/libc/arch-arm/syscalls/getegid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getegid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/geteuid.S b/libc/arch-arm/syscalls/geteuid.S
index f09fbcd0e..78e5cf419 100644
--- a/libc/arch-arm/syscalls/geteuid.S
+++ b/libc/arch-arm/syscalls/geteuid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(geteuid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getgid.S b/libc/arch-arm/syscalls/getgid.S
index 667c39456..c2d353810 100644
--- a/libc/arch-arm/syscalls/getgid.S
+++ b/libc/arch-arm/syscalls/getgid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getgid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getgroups.S b/libc/arch-arm/syscalls/getgroups.S
index 2f7d122b2..e6b8e105d 100644
--- a/libc/arch-arm/syscalls/getgroups.S
+++ b/libc/arch-arm/syscalls/getgroups.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getgroups)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getitimer.S b/libc/arch-arm/syscalls/getitimer.S
index d83809d08..3dce70767 100644
--- a/libc/arch-arm/syscalls/getitimer.S
+++ b/libc/arch-arm/syscalls/getitimer.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getitimer)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getpeername.S b/libc/arch-arm/syscalls/getpeername.S
index 01dc153c8..0613231cb 100644
--- a/libc/arch-arm/syscalls/getpeername.S
+++ b/libc/arch-arm/syscalls/getpeername.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getpeername)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getpgid.S b/libc/arch-arm/syscalls/getpgid.S
index d84016808..1992afc24 100644
--- a/libc/arch-arm/syscalls/getpgid.S
+++ b/libc/arch-arm/syscalls/getpgid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getpgid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getpid.S b/libc/arch-arm/syscalls/getpid.S
index bbb740522..10bcb8e28 100644
--- a/libc/arch-arm/syscalls/getpid.S
+++ b/libc/arch-arm/syscalls/getpid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getpid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getppid.S b/libc/arch-arm/syscalls/getppid.S
index cfaac830f..594fca5d1 100644
--- a/libc/arch-arm/syscalls/getppid.S
+++ b/libc/arch-arm/syscalls/getppid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getppid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getresgid.S b/libc/arch-arm/syscalls/getresgid.S
index 5a60d2fc8..9dcdb33db 100644
--- a/libc/arch-arm/syscalls/getresgid.S
+++ b/libc/arch-arm/syscalls/getresgid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getresgid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getresuid.S b/libc/arch-arm/syscalls/getresuid.S
index 70a586142..387bd7c2d 100644
--- a/libc/arch-arm/syscalls/getresuid.S
+++ b/libc/arch-arm/syscalls/getresuid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getresuid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getrlimit.S b/libc/arch-arm/syscalls/getrlimit.S
index 75c408e64..879b66689 100644
--- a/libc/arch-arm/syscalls/getrlimit.S
+++ b/libc/arch-arm/syscalls/getrlimit.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getrlimit)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getrusage.S b/libc/arch-arm/syscalls/getrusage.S
index 57fac4461..ee84f490d 100644
--- a/libc/arch-arm/syscalls/getrusage.S
+++ b/libc/arch-arm/syscalls/getrusage.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getrusage)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getsid.S b/libc/arch-arm/syscalls/getsid.S
index d30a88d37..715f217e9 100644
--- a/libc/arch-arm/syscalls/getsid.S
+++ b/libc/arch-arm/syscalls/getsid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getsid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getsockname.S b/libc/arch-arm/syscalls/getsockname.S
index 332c9709d..2ee68f38b 100644
--- a/libc/arch-arm/syscalls/getsockname.S
+++ b/libc/arch-arm/syscalls/getsockname.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getsockname)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getsockopt.S b/libc/arch-arm/syscalls/getsockopt.S
index 9b721968c..e5cac3080 100644
--- a/libc/arch-arm/syscalls/getsockopt.S
+++ b/libc/arch-arm/syscalls/getsockopt.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getsockopt)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/gettid.S b/libc/arch-arm/syscalls/gettid.S
index 5eba148dc..3928be122 100644
--- a/libc/arch-arm/syscalls/gettid.S
+++ b/libc/arch-arm/syscalls/gettid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(gettid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/gettimeofday.S b/libc/arch-arm/syscalls/gettimeofday.S
index 66f6810c7..4d33b5dbc 100644
--- a/libc/arch-arm/syscalls/gettimeofday.S
+++ b/libc/arch-arm/syscalls/gettimeofday.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(gettimeofday)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getuid.S b/libc/arch-arm/syscalls/getuid.S
index 1bc3041d7..66f570f3b 100644
--- a/libc/arch-arm/syscalls/getuid.S
+++ b/libc/arch-arm/syscalls/getuid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getuid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/getxattr.S b/libc/arch-arm/syscalls/getxattr.S
index 7a57946d2..71d003545 100644
--- a/libc/arch-arm/syscalls/getxattr.S
+++ b/libc/arch-arm/syscalls/getxattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(getxattr)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/init_module.S b/libc/arch-arm/syscalls/init_module.S
index 663f54ed4..6850ddf0a 100644
--- a/libc/arch-arm/syscalls/init_module.S
+++ b/libc/arch-arm/syscalls/init_module.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(init_module)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/inotify_add_watch.S b/libc/arch-arm/syscalls/inotify_add_watch.S
index fff219a82..367a49fe1 100644
--- a/libc/arch-arm/syscalls/inotify_add_watch.S
+++ b/libc/arch-arm/syscalls/inotify_add_watch.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(inotify_add_watch)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/inotify_init1.S b/libc/arch-arm/syscalls/inotify_init1.S
index 29595773a..13e175fed 100644
--- a/libc/arch-arm/syscalls/inotify_init1.S
+++ b/libc/arch-arm/syscalls/inotify_init1.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(inotify_init1)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/inotify_rm_watch.S b/libc/arch-arm/syscalls/inotify_rm_watch.S
index 5ca0eb7d6..b80e0f8f8 100644
--- a/libc/arch-arm/syscalls/inotify_rm_watch.S
+++ b/libc/arch-arm/syscalls/inotify_rm_watch.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(inotify_rm_watch)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/ioprio_get.S b/libc/arch-arm/syscalls/ioprio_get.S
index ff30905fe..19e04ed1f 100644
--- a/libc/arch-arm/syscalls/ioprio_get.S
+++ b/libc/arch-arm/syscalls/ioprio_get.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(ioprio_get)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/ioprio_set.S b/libc/arch-arm/syscalls/ioprio_set.S
index 9c53f969b..9b94efb59 100644
--- a/libc/arch-arm/syscalls/ioprio_set.S
+++ b/libc/arch-arm/syscalls/ioprio_set.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(ioprio_set)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/klogctl.S b/libc/arch-arm/syscalls/klogctl.S
index 6012ba98e..84ce7f631 100644
--- a/libc/arch-arm/syscalls/klogctl.S
+++ b/libc/arch-arm/syscalls/klogctl.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(klogctl)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/lgetxattr.S b/libc/arch-arm/syscalls/lgetxattr.S
index 76e11dc26..9eed67f92 100644
--- a/libc/arch-arm/syscalls/lgetxattr.S
+++ b/libc/arch-arm/syscalls/lgetxattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(lgetxattr)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/linkat.S b/libc/arch-arm/syscalls/linkat.S
index e990ce15b..5e4d541ba 100644
--- a/libc/arch-arm/syscalls/linkat.S
+++ b/libc/arch-arm/syscalls/linkat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(linkat)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/listen.S b/libc/arch-arm/syscalls/listen.S
index 3a5fc4d3a..330ea56ad 100644
--- a/libc/arch-arm/syscalls/listen.S
+++ b/libc/arch-arm/syscalls/listen.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(listen)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/listxattr.S b/libc/arch-arm/syscalls/listxattr.S
index 1fb7bcecc..c64e484cf 100644
--- a/libc/arch-arm/syscalls/listxattr.S
+++ b/libc/arch-arm/syscalls/listxattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(listxattr)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/llistxattr.S b/libc/arch-arm/syscalls/llistxattr.S
index 24e4ece73..cea926b05 100644
--- a/libc/arch-arm/syscalls/llistxattr.S
+++ b/libc/arch-arm/syscalls/llistxattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(llistxattr)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/lremovexattr.S b/libc/arch-arm/syscalls/lremovexattr.S
index 2bb64c0e6..c7a6458f9 100644
--- a/libc/arch-arm/syscalls/lremovexattr.S
+++ b/libc/arch-arm/syscalls/lremovexattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(lremovexattr)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/lseek.S b/libc/arch-arm/syscalls/lseek.S
index 93bb0b567..9edae376c 100644
--- a/libc/arch-arm/syscalls/lseek.S
+++ b/libc/arch-arm/syscalls/lseek.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(lseek)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/lsetxattr.S b/libc/arch-arm/syscalls/lsetxattr.S
index aa5d2deb4..c1a26b426 100644
--- a/libc/arch-arm/syscalls/lsetxattr.S
+++ b/libc/arch-arm/syscalls/lsetxattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(lsetxattr)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/madvise.S b/libc/arch-arm/syscalls/madvise.S
index fc0870b65..ee2c2a50d 100644
--- a/libc/arch-arm/syscalls/madvise.S
+++ b/libc/arch-arm/syscalls/madvise.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(madvise)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/mincore.S b/libc/arch-arm/syscalls/mincore.S
index 8ea4bb8a7..9ef923725 100644
--- a/libc/arch-arm/syscalls/mincore.S
+++ b/libc/arch-arm/syscalls/mincore.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(mincore)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/mkdirat.S b/libc/arch-arm/syscalls/mkdirat.S
index 45f9bbeae..9e77ef01d 100644
--- a/libc/arch-arm/syscalls/mkdirat.S
+++ b/libc/arch-arm/syscalls/mkdirat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(mkdirat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/mknodat.S b/libc/arch-arm/syscalls/mknodat.S
index 4a64eeade..de492da90 100644
--- a/libc/arch-arm/syscalls/mknodat.S
+++ b/libc/arch-arm/syscalls/mknodat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(mknodat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/mlock.S b/libc/arch-arm/syscalls/mlock.S
index 810949a21..043b21b56 100644
--- a/libc/arch-arm/syscalls/mlock.S
+++ b/libc/arch-arm/syscalls/mlock.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(mlock)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/mlockall.S b/libc/arch-arm/syscalls/mlockall.S
index 561f18fa7..9c6c4e451 100644
--- a/libc/arch-arm/syscalls/mlockall.S
+++ b/libc/arch-arm/syscalls/mlockall.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(mlockall)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/mount.S b/libc/arch-arm/syscalls/mount.S
index c62c1011a..dae9f3c28 100644
--- a/libc/arch-arm/syscalls/mount.S
+++ b/libc/arch-arm/syscalls/mount.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(mount)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/mprotect.S b/libc/arch-arm/syscalls/mprotect.S
index 910dd7c06..9461d9b05 100644
--- a/libc/arch-arm/syscalls/mprotect.S
+++ b/libc/arch-arm/syscalls/mprotect.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(mprotect)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/mremap.S b/libc/arch-arm/syscalls/mremap.S
index 4864b88a9..2486fc9d2 100644
--- a/libc/arch-arm/syscalls/mremap.S
+++ b/libc/arch-arm/syscalls/mremap.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(mremap)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/msync.S b/libc/arch-arm/syscalls/msync.S
index 733172730..3fc411809 100644
--- a/libc/arch-arm/syscalls/msync.S
+++ b/libc/arch-arm/syscalls/msync.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(msync)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/munlock.S b/libc/arch-arm/syscalls/munlock.S
index 4eba1697b..c89fd3c3a 100644
--- a/libc/arch-arm/syscalls/munlock.S
+++ b/libc/arch-arm/syscalls/munlock.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(munlock)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/munlockall.S b/libc/arch-arm/syscalls/munlockall.S
index 7ded5c489..3ac9f32bc 100644
--- a/libc/arch-arm/syscalls/munlockall.S
+++ b/libc/arch-arm/syscalls/munlockall.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(munlockall)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/munmap.S b/libc/arch-arm/syscalls/munmap.S
index 16bb74d13..ed3bb1e4f 100644
--- a/libc/arch-arm/syscalls/munmap.S
+++ b/libc/arch-arm/syscalls/munmap.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(munmap)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/nanosleep.S b/libc/arch-arm/syscalls/nanosleep.S
index 9cd95fdbf..695c1260c 100644
--- a/libc/arch-arm/syscalls/nanosleep.S
+++ b/libc/arch-arm/syscalls/nanosleep.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(nanosleep)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/perf_event_open.S b/libc/arch-arm/syscalls/perf_event_open.S
index 9caae6caf..4cd624eff 100644
--- a/libc/arch-arm/syscalls/perf_event_open.S
+++ b/libc/arch-arm/syscalls/perf_event_open.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(perf_event_open)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/personality.S b/libc/arch-arm/syscalls/personality.S
index 34cce9e36..e3f7371da 100644
--- a/libc/arch-arm/syscalls/personality.S
+++ b/libc/arch-arm/syscalls/personality.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(personality)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/pipe2.S b/libc/arch-arm/syscalls/pipe2.S
index bbfecabe7..420dee9a3 100644
--- a/libc/arch-arm/syscalls/pipe2.S
+++ b/libc/arch-arm/syscalls/pipe2.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(pipe2)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/prctl.S b/libc/arch-arm/syscalls/prctl.S
index 4c0a87c79..51b3c97c6 100644
--- a/libc/arch-arm/syscalls/prctl.S
+++ b/libc/arch-arm/syscalls/prctl.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(prctl)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/pread64.S b/libc/arch-arm/syscalls/pread64.S
index bd8fd0b38..59bd15468 100644
--- a/libc/arch-arm/syscalls/pread64.S
+++ b/libc/arch-arm/syscalls/pread64.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(pread64)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/pwrite64.S b/libc/arch-arm/syscalls/pwrite64.S
index 6c9d530c8..18477f4c5 100644
--- a/libc/arch-arm/syscalls/pwrite64.S
+++ b/libc/arch-arm/syscalls/pwrite64.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(pwrite64)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/read.S b/libc/arch-arm/syscalls/read.S
index 41e93ce83..b01daf56a 100644
--- a/libc/arch-arm/syscalls/read.S
+++ b/libc/arch-arm/syscalls/read.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(read)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/readahead.S b/libc/arch-arm/syscalls/readahead.S
index 34f1cded4..acd35bdbb 100644
--- a/libc/arch-arm/syscalls/readahead.S
+++ b/libc/arch-arm/syscalls/readahead.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(readahead)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/readlinkat.S b/libc/arch-arm/syscalls/readlinkat.S
index 3d85e565b..28926abc9 100644
--- a/libc/arch-arm/syscalls/readlinkat.S
+++ b/libc/arch-arm/syscalls/readlinkat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(readlinkat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/readv.S b/libc/arch-arm/syscalls/readv.S
index 24b20a333..433d33d65 100644
--- a/libc/arch-arm/syscalls/readv.S
+++ b/libc/arch-arm/syscalls/readv.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(readv)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/recvfrom.S b/libc/arch-arm/syscalls/recvfrom.S
index f12b35afd..54c785526 100644
--- a/libc/arch-arm/syscalls/recvfrom.S
+++ b/libc/arch-arm/syscalls/recvfrom.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(recvfrom)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/recvmsg.S b/libc/arch-arm/syscalls/recvmsg.S
index a2755dd45..47e82a78d 100644
--- a/libc/arch-arm/syscalls/recvmsg.S
+++ b/libc/arch-arm/syscalls/recvmsg.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(recvmsg)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/removexattr.S b/libc/arch-arm/syscalls/removexattr.S
index bbc3e53fe..a3fcdfa2f 100644
--- a/libc/arch-arm/syscalls/removexattr.S
+++ b/libc/arch-arm/syscalls/removexattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(removexattr)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/renameat.S b/libc/arch-arm/syscalls/renameat.S
index bb59bda03..cea6286dd 100644
--- a/libc/arch-arm/syscalls/renameat.S
+++ b/libc/arch-arm/syscalls/renameat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(renameat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sched_get_priority_max.S b/libc/arch-arm/syscalls/sched_get_priority_max.S
index 2433afabb..c940adc5a 100644
--- a/libc/arch-arm/syscalls/sched_get_priority_max.S
+++ b/libc/arch-arm/syscalls/sched_get_priority_max.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sched_get_priority_max)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sched_get_priority_min.S b/libc/arch-arm/syscalls/sched_get_priority_min.S
index ea52f7a4d..39faedec8 100644
--- a/libc/arch-arm/syscalls/sched_get_priority_min.S
+++ b/libc/arch-arm/syscalls/sched_get_priority_min.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sched_get_priority_min)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sched_getparam.S b/libc/arch-arm/syscalls/sched_getparam.S
index 57a1800c6..59df104d7 100644
--- a/libc/arch-arm/syscalls/sched_getparam.S
+++ b/libc/arch-arm/syscalls/sched_getparam.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sched_getparam)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sched_getscheduler.S b/libc/arch-arm/syscalls/sched_getscheduler.S
index f49ae0147..953368df6 100644
--- a/libc/arch-arm/syscalls/sched_getscheduler.S
+++ b/libc/arch-arm/syscalls/sched_getscheduler.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sched_getscheduler)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sched_rr_get_interval.S b/libc/arch-arm/syscalls/sched_rr_get_interval.S
index e54bbee66..1fa7d1577 100644
--- a/libc/arch-arm/syscalls/sched_rr_get_interval.S
+++ b/libc/arch-arm/syscalls/sched_rr_get_interval.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sched_rr_get_interval)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sched_setaffinity.S b/libc/arch-arm/syscalls/sched_setaffinity.S
index bf1c89fb9..63bfe4da8 100644
--- a/libc/arch-arm/syscalls/sched_setaffinity.S
+++ b/libc/arch-arm/syscalls/sched_setaffinity.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sched_setaffinity)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sched_setparam.S b/libc/arch-arm/syscalls/sched_setparam.S
index 68424cd4c..324f0bbfa 100644
--- a/libc/arch-arm/syscalls/sched_setparam.S
+++ b/libc/arch-arm/syscalls/sched_setparam.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sched_setparam)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sched_setscheduler.S b/libc/arch-arm/syscalls/sched_setscheduler.S
index 756f2b09d..0ce6b1567 100644
--- a/libc/arch-arm/syscalls/sched_setscheduler.S
+++ b/libc/arch-arm/syscalls/sched_setscheduler.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sched_setscheduler)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sched_yield.S b/libc/arch-arm/syscalls/sched_yield.S
index 38b858fc2..8e6d65aec 100644
--- a/libc/arch-arm/syscalls/sched_yield.S
+++ b/libc/arch-arm/syscalls/sched_yield.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sched_yield)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sendfile.S b/libc/arch-arm/syscalls/sendfile.S
index 462c0ff95..28b25a357 100644
--- a/libc/arch-arm/syscalls/sendfile.S
+++ b/libc/arch-arm/syscalls/sendfile.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sendfile)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sendfile64.S b/libc/arch-arm/syscalls/sendfile64.S
index 50f107a70..4a9f24563 100644
--- a/libc/arch-arm/syscalls/sendfile64.S
+++ b/libc/arch-arm/syscalls/sendfile64.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sendfile64)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sendmsg.S b/libc/arch-arm/syscalls/sendmsg.S
index b88e96003..554f30739 100644
--- a/libc/arch-arm/syscalls/sendmsg.S
+++ b/libc/arch-arm/syscalls/sendmsg.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sendmsg)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sendto.S b/libc/arch-arm/syscalls/sendto.S
index 7884445e8..b430e0673 100644
--- a/libc/arch-arm/syscalls/sendto.S
+++ b/libc/arch-arm/syscalls/sendto.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sendto)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/setgid.S b/libc/arch-arm/syscalls/setgid.S
index 966832e6d..fb38148b2 100644
--- a/libc/arch-arm/syscalls/setgid.S
+++ b/libc/arch-arm/syscalls/setgid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setgid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setgroups.S b/libc/arch-arm/syscalls/setgroups.S
index aea556755..5420a5368 100644
--- a/libc/arch-arm/syscalls/setgroups.S
+++ b/libc/arch-arm/syscalls/setgroups.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setgroups)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setitimer.S b/libc/arch-arm/syscalls/setitimer.S
index ee49a52ed..2345e5b87 100644
--- a/libc/arch-arm/syscalls/setitimer.S
+++ b/libc/arch-arm/syscalls/setitimer.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setitimer)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setpgid.S b/libc/arch-arm/syscalls/setpgid.S
index eef4bb9e8..1470a9dbd 100644
--- a/libc/arch-arm/syscalls/setpgid.S
+++ b/libc/arch-arm/syscalls/setpgid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setpgid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setpriority.S b/libc/arch-arm/syscalls/setpriority.S
index db42491a0..b7f47bea3 100644
--- a/libc/arch-arm/syscalls/setpriority.S
+++ b/libc/arch-arm/syscalls/setpriority.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setpriority)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setregid.S b/libc/arch-arm/syscalls/setregid.S
index ca060cbe2..a4323d472 100644
--- a/libc/arch-arm/syscalls/setregid.S
+++ b/libc/arch-arm/syscalls/setregid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setregid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setresgid.S b/libc/arch-arm/syscalls/setresgid.S
index a05ed75a7..a578440c8 100644
--- a/libc/arch-arm/syscalls/setresgid.S
+++ b/libc/arch-arm/syscalls/setresgid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setresgid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setresuid.S b/libc/arch-arm/syscalls/setresuid.S
index 4810970b8..9798bc592 100644
--- a/libc/arch-arm/syscalls/setresuid.S
+++ b/libc/arch-arm/syscalls/setresuid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setresuid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setreuid.S b/libc/arch-arm/syscalls/setreuid.S
index 92310d43b..fa83dc65d 100644
--- a/libc/arch-arm/syscalls/setreuid.S
+++ b/libc/arch-arm/syscalls/setreuid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setreuid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setrlimit.S b/libc/arch-arm/syscalls/setrlimit.S
index ce89b25bb..0711aca20 100644
--- a/libc/arch-arm/syscalls/setrlimit.S
+++ b/libc/arch-arm/syscalls/setrlimit.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setrlimit)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setsid.S b/libc/arch-arm/syscalls/setsid.S
index acd132fcc..df6196b99 100644
--- a/libc/arch-arm/syscalls/setsid.S
+++ b/libc/arch-arm/syscalls/setsid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setsid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setsockopt.S b/libc/arch-arm/syscalls/setsockopt.S
index 3185246ca..9dc7b1ed6 100644
--- a/libc/arch-arm/syscalls/setsockopt.S
+++ b/libc/arch-arm/syscalls/setsockopt.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setsockopt)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/settimeofday.S b/libc/arch-arm/syscalls/settimeofday.S
index a69074c54..af397616c 100644
--- a/libc/arch-arm/syscalls/settimeofday.S
+++ b/libc/arch-arm/syscalls/settimeofday.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(settimeofday)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setuid.S b/libc/arch-arm/syscalls/setuid.S
index bdbb04a32..1999c2b18 100644
--- a/libc/arch-arm/syscalls/setuid.S
+++ b/libc/arch-arm/syscalls/setuid.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setuid)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/setxattr.S b/libc/arch-arm/syscalls/setxattr.S
index 0b0307d80..536630b63 100644
--- a/libc/arch-arm/syscalls/setxattr.S
+++ b/libc/arch-arm/syscalls/setxattr.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(setxattr)
mov ip, sp
diff --git a/libc/arch-arm/syscalls/shutdown.S b/libc/arch-arm/syscalls/shutdown.S
index d7d026043..744f38479 100644
--- a/libc/arch-arm/syscalls/shutdown.S
+++ b/libc/arch-arm/syscalls/shutdown.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(shutdown)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sigaltstack.S b/libc/arch-arm/syscalls/sigaltstack.S
index aefe51a23..d8777b411 100644
--- a/libc/arch-arm/syscalls/sigaltstack.S
+++ b/libc/arch-arm/syscalls/sigaltstack.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sigaltstack)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/signalfd4.S b/libc/arch-arm/syscalls/signalfd4.S
index 162483f35..f8d8a2855 100644
--- a/libc/arch-arm/syscalls/signalfd4.S
+++ b/libc/arch-arm/syscalls/signalfd4.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(signalfd4)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/socket.S b/libc/arch-arm/syscalls/socket.S
index cde80b0cc..05fa529ab 100644
--- a/libc/arch-arm/syscalls/socket.S
+++ b/libc/arch-arm/syscalls/socket.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(socket)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/socketpair.S b/libc/arch-arm/syscalls/socketpair.S
index 068185715..f8963139b 100644
--- a/libc/arch-arm/syscalls/socketpair.S
+++ b/libc/arch-arm/syscalls/socketpair.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(socketpair)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/swapoff.S b/libc/arch-arm/syscalls/swapoff.S
index 90f00f89f..f78bc7ffe 100644
--- a/libc/arch-arm/syscalls/swapoff.S
+++ b/libc/arch-arm/syscalls/swapoff.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(swapoff)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/swapon.S b/libc/arch-arm/syscalls/swapon.S
index 7108aa339..d28216ad3 100644
--- a/libc/arch-arm/syscalls/swapon.S
+++ b/libc/arch-arm/syscalls/swapon.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(swapon)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/symlinkat.S b/libc/arch-arm/syscalls/symlinkat.S
index fb51f1982..d81e43bad 100644
--- a/libc/arch-arm/syscalls/symlinkat.S
+++ b/libc/arch-arm/syscalls/symlinkat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(symlinkat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sync.S b/libc/arch-arm/syscalls/sync.S
index 9f7d049e6..279a19250 100644
--- a/libc/arch-arm/syscalls/sync.S
+++ b/libc/arch-arm/syscalls/sync.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sync)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/sysinfo.S b/libc/arch-arm/syscalls/sysinfo.S
index b3c2df21c..6bee58334 100644
--- a/libc/arch-arm/syscalls/sysinfo.S
+++ b/libc/arch-arm/syscalls/sysinfo.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(sysinfo)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/timerfd_create.S b/libc/arch-arm/syscalls/timerfd_create.S
index 4970f0834..f5842e90e 100644
--- a/libc/arch-arm/syscalls/timerfd_create.S
+++ b/libc/arch-arm/syscalls/timerfd_create.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(timerfd_create)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/timerfd_gettime.S b/libc/arch-arm/syscalls/timerfd_gettime.S
index 34e967184..6f254e5c4 100644
--- a/libc/arch-arm/syscalls/timerfd_gettime.S
+++ b/libc/arch-arm/syscalls/timerfd_gettime.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(timerfd_gettime)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/timerfd_settime.S b/libc/arch-arm/syscalls/timerfd_settime.S
index 132ad6857..75d175cca 100644
--- a/libc/arch-arm/syscalls/timerfd_settime.S
+++ b/libc/arch-arm/syscalls/timerfd_settime.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(timerfd_settime)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/times.S b/libc/arch-arm/syscalls/times.S
index e6fdaf1cc..4792ad115 100644
--- a/libc/arch-arm/syscalls/times.S
+++ b/libc/arch-arm/syscalls/times.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(times)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/truncate.S b/libc/arch-arm/syscalls/truncate.S
index aa16d225c..ff8fd19f2 100644
--- a/libc/arch-arm/syscalls/truncate.S
+++ b/libc/arch-arm/syscalls/truncate.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(truncate)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/truncate64.S b/libc/arch-arm/syscalls/truncate64.S
index 97734ffe9..8fd08552b 100644
--- a/libc/arch-arm/syscalls/truncate64.S
+++ b/libc/arch-arm/syscalls/truncate64.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(truncate64)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/umask.S b/libc/arch-arm/syscalls/umask.S
index 147877541..830af21eb 100644
--- a/libc/arch-arm/syscalls/umask.S
+++ b/libc/arch-arm/syscalls/umask.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(umask)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/umount2.S b/libc/arch-arm/syscalls/umount2.S
index 16137676c..4c0ce4d5b 100644
--- a/libc/arch-arm/syscalls/umount2.S
+++ b/libc/arch-arm/syscalls/umount2.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(umount2)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/uname.S b/libc/arch-arm/syscalls/uname.S
index ad06ef45a..20a6d7dac 100644
--- a/libc/arch-arm/syscalls/uname.S
+++ b/libc/arch-arm/syscalls/uname.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(uname)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/unlinkat.S b/libc/arch-arm/syscalls/unlinkat.S
index 5002f5741..1c2741676 100644
--- a/libc/arch-arm/syscalls/unlinkat.S
+++ b/libc/arch-arm/syscalls/unlinkat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(unlinkat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/unshare.S b/libc/arch-arm/syscalls/unshare.S
index dd1365c37..5ec104974 100644
--- a/libc/arch-arm/syscalls/unshare.S
+++ b/libc/arch-arm/syscalls/unshare.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(unshare)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/utimensat.S b/libc/arch-arm/syscalls/utimensat.S
index bebe83cb0..f0f834fc3 100644
--- a/libc/arch-arm/syscalls/utimensat.S
+++ b/libc/arch-arm/syscalls/utimensat.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(utimensat)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/vfork.S b/libc/arch-arm/syscalls/vfork.S
index aec2dc834..e12fba55a 100644
--- a/libc/arch-arm/syscalls/vfork.S
+++ b/libc/arch-arm/syscalls/vfork.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(vfork)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/wait4.S b/libc/arch-arm/syscalls/wait4.S
index b8f96a59c..a197c2e5d 100644
--- a/libc/arch-arm/syscalls/wait4.S
+++ b/libc/arch-arm/syscalls/wait4.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(wait4)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/write.S b/libc/arch-arm/syscalls/write.S
index b5bb71199..ed7cfa2e4 100644
--- a/libc/arch-arm/syscalls/write.S
+++ b/libc/arch-arm/syscalls/write.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(write)
mov ip, r7
diff --git a/libc/arch-arm/syscalls/writev.S b/libc/arch-arm/syscalls/writev.S
index a2cb149d6..8cc506f60 100644
--- a/libc/arch-arm/syscalls/writev.S
+++ b/libc/arch-arm/syscalls/writev.S
@@ -1,8 +1,6 @@
/* Generated by gensyscalls.py. Do not edit. */
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(writev)
mov ip, r7