aboutsummaryrefslogtreecommitdiffstats
path: root/libc
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-11-07 10:31:05 -0800
committerElliott Hughes <enh@google.com>2013-11-07 10:31:05 -0800
commited74484dcbc2e156a6e5fa861a62425b12e55128 (patch)
treed41520a7d4f893cef86ab650b23e400e30351446 /libc
parenta034e1d3e06207f079e814101bb3bce1924264e0 (diff)
downloadandroid_bionic-ed74484dcbc2e156a6e5fa861a62425b12e55128.tar.gz
android_bionic-ed74484dcbc2e156a6e5fa861a62425b12e55128.tar.bz2
android_bionic-ed74484dcbc2e156a6e5fa861a62425b12e55128.zip
Stop using the non-uapi <linux/err.h> header file.
We only need it for MAX_ERRNO, and it's time we had somewhere to put the little assembler utility macros we've been putting off writing. Change-Id: I9354d2e0dc47c689296a34b5b229fc9ba75f1a83
Diffstat (limited to 'libc')
-rw-r--r--libc/arch-aarch64/syscalls/__brk.S4
-rw-r--r--libc/arch-aarch64/syscalls/__clone.S4
-rw-r--r--libc/arch-aarch64/syscalls/__epoll_pwait.S4
-rw-r--r--libc/arch-aarch64/syscalls/__exit.S4
-rw-r--r--libc/arch-aarch64/syscalls/__getcpu.S4
-rw-r--r--libc/arch-aarch64/syscalls/__getcwd.S4
-rw-r--r--libc/arch-aarch64/syscalls/__getpriority.S4
-rw-r--r--libc/arch-aarch64/syscalls/__ioctl.S4
-rw-r--r--libc/arch-aarch64/syscalls/__openat.S4
-rw-r--r--libc/arch-aarch64/syscalls/__ppoll.S4
-rw-r--r--libc/arch-aarch64/syscalls/__pselect6.S4
-rw-r--r--libc/arch-aarch64/syscalls/__ptrace.S4
-rw-r--r--libc/arch-aarch64/syscalls/__reboot.S4
-rw-r--r--libc/arch-aarch64/syscalls/__rt_sigaction.S4
-rw-r--r--libc/arch-aarch64/syscalls/__rt_sigpending.S4
-rw-r--r--libc/arch-aarch64/syscalls/__rt_sigprocmask.S4
-rw-r--r--libc/arch-aarch64/syscalls/__rt_sigsuspend.S4
-rw-r--r--libc/arch-aarch64/syscalls/__rt_sigtimedwait.S4
-rw-r--r--libc/arch-aarch64/syscalls/__sched_getaffinity.S4
-rw-r--r--libc/arch-aarch64/syscalls/__syslog.S4
-rw-r--r--libc/arch-aarch64/syscalls/__timer_create.S4
-rw-r--r--libc/arch-aarch64/syscalls/__timer_delete.S4
-rw-r--r--libc/arch-aarch64/syscalls/__timer_getoverrun.S4
-rw-r--r--libc/arch-aarch64/syscalls/__timer_gettime.S4
-rw-r--r--libc/arch-aarch64/syscalls/__timer_settime.S4
-rw-r--r--libc/arch-aarch64/syscalls/__waitid.S4
-rw-r--r--libc/arch-aarch64/syscalls/_exit.S4
-rw-r--r--libc/arch-aarch64/syscalls/accept.S4
-rw-r--r--libc/arch-aarch64/syscalls/acct.S4
-rw-r--r--libc/arch-aarch64/syscalls/bind.S4
-rw-r--r--libc/arch-aarch64/syscalls/capget.S4
-rw-r--r--libc/arch-aarch64/syscalls/capset.S4
-rw-r--r--libc/arch-aarch64/syscalls/chdir.S4
-rw-r--r--libc/arch-aarch64/syscalls/chroot.S4
-rw-r--r--libc/arch-aarch64/syscalls/clock_getres.S4
-rw-r--r--libc/arch-aarch64/syscalls/clock_gettime.S4
-rw-r--r--libc/arch-aarch64/syscalls/clock_nanosleep.S4
-rw-r--r--libc/arch-aarch64/syscalls/clock_settime.S4
-rw-r--r--libc/arch-aarch64/syscalls/close.S4
-rw-r--r--libc/arch-aarch64/syscalls/connect.S4
-rw-r--r--libc/arch-aarch64/syscalls/delete_module.S4
-rw-r--r--libc/arch-aarch64/syscalls/dup.S4
-rw-r--r--libc/arch-aarch64/syscalls/dup3.S4
-rw-r--r--libc/arch-aarch64/syscalls/epoll_create1.S4
-rw-r--r--libc/arch-aarch64/syscalls/epoll_ctl.S4
-rw-r--r--libc/arch-aarch64/syscalls/eventfd.S4
-rw-r--r--libc/arch-aarch64/syscalls/execve.S4
-rw-r--r--libc/arch-aarch64/syscalls/faccessat.S4
-rw-r--r--libc/arch-aarch64/syscalls/fchdir.S4
-rw-r--r--libc/arch-aarch64/syscalls/fchmod.S4
-rw-r--r--libc/arch-aarch64/syscalls/fchmodat.S4
-rw-r--r--libc/arch-aarch64/syscalls/fchown.S4
-rw-r--r--libc/arch-aarch64/syscalls/fchownat.S4
-rw-r--r--libc/arch-aarch64/syscalls/fcntl.S4
-rw-r--r--libc/arch-aarch64/syscalls/fdatasync.S4
-rw-r--r--libc/arch-aarch64/syscalls/fgetxattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/flistxattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/flock.S4
-rw-r--r--libc/arch-aarch64/syscalls/fremovexattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/fsetxattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/fstat.S4
-rw-r--r--libc/arch-aarch64/syscalls/fstatat.S4
-rw-r--r--libc/arch-aarch64/syscalls/fstatfs.S4
-rw-r--r--libc/arch-aarch64/syscalls/fsync.S4
-rw-r--r--libc/arch-aarch64/syscalls/ftruncate.S4
-rw-r--r--libc/arch-aarch64/syscalls/futex.S4
-rw-r--r--libc/arch-aarch64/syscalls/getdents.S4
-rw-r--r--libc/arch-aarch64/syscalls/getegid.S4
-rw-r--r--libc/arch-aarch64/syscalls/geteuid.S4
-rw-r--r--libc/arch-aarch64/syscalls/getgid.S4
-rw-r--r--libc/arch-aarch64/syscalls/getgroups.S4
-rw-r--r--libc/arch-aarch64/syscalls/getitimer.S4
-rw-r--r--libc/arch-aarch64/syscalls/getpeername.S4
-rw-r--r--libc/arch-aarch64/syscalls/getpgid.S4
-rw-r--r--libc/arch-aarch64/syscalls/getpid.S4
-rw-r--r--libc/arch-aarch64/syscalls/getppid.S4
-rw-r--r--libc/arch-aarch64/syscalls/getresgid.S4
-rw-r--r--libc/arch-aarch64/syscalls/getresuid.S4
-rw-r--r--libc/arch-aarch64/syscalls/getrlimit.S4
-rw-r--r--libc/arch-aarch64/syscalls/getrusage.S4
-rw-r--r--libc/arch-aarch64/syscalls/getsid.S4
-rw-r--r--libc/arch-aarch64/syscalls/getsockname.S4
-rw-r--r--libc/arch-aarch64/syscalls/getsockopt.S4
-rw-r--r--libc/arch-aarch64/syscalls/gettid.S4
-rw-r--r--libc/arch-aarch64/syscalls/gettimeofday.S4
-rw-r--r--libc/arch-aarch64/syscalls/getuid.S4
-rw-r--r--libc/arch-aarch64/syscalls/getxattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/init_module.S4
-rw-r--r--libc/arch-aarch64/syscalls/inotify_add_watch.S4
-rw-r--r--libc/arch-aarch64/syscalls/inotify_init1.S4
-rw-r--r--libc/arch-aarch64/syscalls/inotify_rm_watch.S4
-rw-r--r--libc/arch-aarch64/syscalls/ioprio_get.S4
-rw-r--r--libc/arch-aarch64/syscalls/ioprio_set.S4
-rw-r--r--libc/arch-aarch64/syscalls/kill.S4
-rw-r--r--libc/arch-aarch64/syscalls/klogctl.S4
-rw-r--r--libc/arch-aarch64/syscalls/lgetxattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/linkat.S4
-rw-r--r--libc/arch-aarch64/syscalls/listen.S4
-rw-r--r--libc/arch-aarch64/syscalls/listxattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/llistxattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/lremovexattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/lseek.S4
-rw-r--r--libc/arch-aarch64/syscalls/lsetxattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/madvise.S4
-rw-r--r--libc/arch-aarch64/syscalls/mincore.S4
-rw-r--r--libc/arch-aarch64/syscalls/mkdirat.S4
-rw-r--r--libc/arch-aarch64/syscalls/mknodat.S4
-rw-r--r--libc/arch-aarch64/syscalls/mlock.S4
-rw-r--r--libc/arch-aarch64/syscalls/mlockall.S4
-rw-r--r--libc/arch-aarch64/syscalls/mmap.S4
-rw-r--r--libc/arch-aarch64/syscalls/mount.S4
-rw-r--r--libc/arch-aarch64/syscalls/mprotect.S4
-rw-r--r--libc/arch-aarch64/syscalls/mremap.S4
-rw-r--r--libc/arch-aarch64/syscalls/msync.S4
-rw-r--r--libc/arch-aarch64/syscalls/munlock.S4
-rw-r--r--libc/arch-aarch64/syscalls/munlockall.S4
-rw-r--r--libc/arch-aarch64/syscalls/munmap.S4
-rw-r--r--libc/arch-aarch64/syscalls/nanosleep.S4
-rw-r--r--libc/arch-aarch64/syscalls/perf_event_open.S4
-rw-r--r--libc/arch-aarch64/syscalls/personality.S4
-rw-r--r--libc/arch-aarch64/syscalls/pipe2.S4
-rw-r--r--libc/arch-aarch64/syscalls/prctl.S4
-rw-r--r--libc/arch-aarch64/syscalls/pread64.S4
-rw-r--r--libc/arch-aarch64/syscalls/pwrite64.S4
-rw-r--r--libc/arch-aarch64/syscalls/read.S4
-rw-r--r--libc/arch-aarch64/syscalls/readahead.S4
-rw-r--r--libc/arch-aarch64/syscalls/readlinkat.S4
-rw-r--r--libc/arch-aarch64/syscalls/readv.S4
-rw-r--r--libc/arch-aarch64/syscalls/recvfrom.S4
-rw-r--r--libc/arch-aarch64/syscalls/recvmsg.S4
-rw-r--r--libc/arch-aarch64/syscalls/removexattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/renameat.S4
-rw-r--r--libc/arch-aarch64/syscalls/sched_get_priority_max.S4
-rw-r--r--libc/arch-aarch64/syscalls/sched_get_priority_min.S4
-rw-r--r--libc/arch-aarch64/syscalls/sched_getparam.S4
-rw-r--r--libc/arch-aarch64/syscalls/sched_getscheduler.S4
-rw-r--r--libc/arch-aarch64/syscalls/sched_rr_get_interval.S4
-rw-r--r--libc/arch-aarch64/syscalls/sched_setaffinity.S4
-rw-r--r--libc/arch-aarch64/syscalls/sched_setparam.S4
-rw-r--r--libc/arch-aarch64/syscalls/sched_setscheduler.S4
-rw-r--r--libc/arch-aarch64/syscalls/sched_yield.S4
-rw-r--r--libc/arch-aarch64/syscalls/sendfile.S4
-rw-r--r--libc/arch-aarch64/syscalls/sendmsg.S4
-rw-r--r--libc/arch-aarch64/syscalls/sendto.S4
-rw-r--r--libc/arch-aarch64/syscalls/setgid.S4
-rw-r--r--libc/arch-aarch64/syscalls/setgroups.S4
-rw-r--r--libc/arch-aarch64/syscalls/setitimer.S4
-rw-r--r--libc/arch-aarch64/syscalls/setpgid.S4
-rw-r--r--libc/arch-aarch64/syscalls/setpriority.S4
-rw-r--r--libc/arch-aarch64/syscalls/setregid.S4
-rw-r--r--libc/arch-aarch64/syscalls/setresgid.S4
-rw-r--r--libc/arch-aarch64/syscalls/setresuid.S4
-rw-r--r--libc/arch-aarch64/syscalls/setreuid.S4
-rw-r--r--libc/arch-aarch64/syscalls/setrlimit.S4
-rw-r--r--libc/arch-aarch64/syscalls/setsid.S4
-rw-r--r--libc/arch-aarch64/syscalls/setsockopt.S4
-rw-r--r--libc/arch-aarch64/syscalls/settimeofday.S4
-rw-r--r--libc/arch-aarch64/syscalls/setuid.S4
-rw-r--r--libc/arch-aarch64/syscalls/setxattr.S4
-rw-r--r--libc/arch-aarch64/syscalls/shutdown.S4
-rw-r--r--libc/arch-aarch64/syscalls/sigaltstack.S4
-rw-r--r--libc/arch-aarch64/syscalls/signalfd4.S4
-rw-r--r--libc/arch-aarch64/syscalls/socket.S4
-rw-r--r--libc/arch-aarch64/syscalls/socketpair.S4
-rw-r--r--libc/arch-aarch64/syscalls/statfs.S4
-rw-r--r--libc/arch-aarch64/syscalls/swapoff.S4
-rw-r--r--libc/arch-aarch64/syscalls/swapon.S4
-rw-r--r--libc/arch-aarch64/syscalls/symlinkat.S4
-rw-r--r--libc/arch-aarch64/syscalls/sync.S4
-rw-r--r--libc/arch-aarch64/syscalls/sysinfo.S4
-rw-r--r--libc/arch-aarch64/syscalls/tgkill.S4
-rw-r--r--libc/arch-aarch64/syscalls/timerfd_create.S4
-rw-r--r--libc/arch-aarch64/syscalls/timerfd_gettime.S4
-rw-r--r--libc/arch-aarch64/syscalls/timerfd_settime.S4
-rw-r--r--libc/arch-aarch64/syscalls/times.S4
-rw-r--r--libc/arch-aarch64/syscalls/tkill.S4
-rw-r--r--libc/arch-aarch64/syscalls/truncate.S4
-rw-r--r--libc/arch-aarch64/syscalls/umask.S4
-rw-r--r--libc/arch-aarch64/syscalls/umount2.S4
-rw-r--r--libc/arch-aarch64/syscalls/uname.S4
-rw-r--r--libc/arch-aarch64/syscalls/unlinkat.S4
-rw-r--r--libc/arch-aarch64/syscalls/unshare.S4
-rw-r--r--libc/arch-aarch64/syscalls/utimensat.S4
-rw-r--r--libc/arch-aarch64/syscalls/wait4.S4
-rw-r--r--libc/arch-aarch64/syscalls/write.S4
-rw-r--r--libc/arch-aarch64/syscalls/writev.S4
-rw-r--r--libc/arch-arm/bionic/clone.S4
-rw-r--r--libc/arch-arm/bionic/kill.S4
-rw-r--r--libc/arch-arm/bionic/syscall.S3
-rw-r--r--libc/arch-arm/bionic/tgkill.S4
-rw-r--r--libc/arch-arm/bionic/tkill.S4
-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
-rw-r--r--libc/arch-x86/syscalls/__brk.S4
-rw-r--r--libc/arch-x86/syscalls/__clone.S4
-rw-r--r--libc/arch-x86/syscalls/__epoll_pwait.S4
-rw-r--r--libc/arch-x86/syscalls/__exit.S4
-rw-r--r--libc/arch-x86/syscalls/__fcntl64.S4
-rw-r--r--libc/arch-x86/syscalls/__fstatfs64.S4
-rw-r--r--libc/arch-x86/syscalls/__getcpu.S4
-rw-r--r--libc/arch-x86/syscalls/__getcwd.S4
-rw-r--r--libc/arch-x86/syscalls/__getpriority.S4
-rw-r--r--libc/arch-x86/syscalls/__ioctl.S4
-rw-r--r--libc/arch-x86/syscalls/__llseek.S4
-rw-r--r--libc/arch-x86/syscalls/__mmap2.S4
-rw-r--r--libc/arch-x86/syscalls/__openat.S4
-rw-r--r--libc/arch-x86/syscalls/__ppoll.S4
-rw-r--r--libc/arch-x86/syscalls/__pselect6.S4
-rw-r--r--libc/arch-x86/syscalls/__ptrace.S4
-rw-r--r--libc/arch-x86/syscalls/__reboot.S4
-rw-r--r--libc/arch-x86/syscalls/__rt_sigaction.S4
-rw-r--r--libc/arch-x86/syscalls/__rt_sigpending.S4
-rw-r--r--libc/arch-x86/syscalls/__rt_sigprocmask.S4
-rw-r--r--libc/arch-x86/syscalls/__rt_sigsuspend.S4
-rw-r--r--libc/arch-x86/syscalls/__rt_sigtimedwait.S4
-rw-r--r--libc/arch-x86/syscalls/__sched_getaffinity.S4
-rw-r--r--libc/arch-x86/syscalls/__set_thread_area.S4
-rw-r--r--libc/arch-x86/syscalls/__sigaction.S4
-rw-r--r--libc/arch-x86/syscalls/__statfs64.S4
-rw-r--r--libc/arch-x86/syscalls/__syslog.S4
-rw-r--r--libc/arch-x86/syscalls/__timer_create.S4
-rw-r--r--libc/arch-x86/syscalls/__timer_delete.S4
-rw-r--r--libc/arch-x86/syscalls/__timer_getoverrun.S4
-rw-r--r--libc/arch-x86/syscalls/__timer_gettime.S4
-rw-r--r--libc/arch-x86/syscalls/__timer_settime.S4
-rw-r--r--libc/arch-x86/syscalls/__waitid.S4
-rw-r--r--libc/arch-x86/syscalls/_exit.S4
-rw-r--r--libc/arch-x86/syscalls/accept.S4
-rw-r--r--libc/arch-x86/syscalls/acct.S4
-rw-r--r--libc/arch-x86/syscalls/bind.S4
-rw-r--r--libc/arch-x86/syscalls/capget.S4
-rw-r--r--libc/arch-x86/syscalls/capset.S4
-rw-r--r--libc/arch-x86/syscalls/chdir.S4
-rw-r--r--libc/arch-x86/syscalls/chroot.S4
-rw-r--r--libc/arch-x86/syscalls/clock_getres.S4
-rw-r--r--libc/arch-x86/syscalls/clock_gettime.S4
-rw-r--r--libc/arch-x86/syscalls/clock_nanosleep.S4
-rw-r--r--libc/arch-x86/syscalls/clock_settime.S4
-rw-r--r--libc/arch-x86/syscalls/close.S4
-rw-r--r--libc/arch-x86/syscalls/connect.S4
-rw-r--r--libc/arch-x86/syscalls/delete_module.S4
-rw-r--r--libc/arch-x86/syscalls/dup.S4
-rw-r--r--libc/arch-x86/syscalls/dup3.S4
-rw-r--r--libc/arch-x86/syscalls/epoll_create1.S4
-rw-r--r--libc/arch-x86/syscalls/epoll_ctl.S4
-rw-r--r--libc/arch-x86/syscalls/eventfd.S4
-rw-r--r--libc/arch-x86/syscalls/execve.S4
-rw-r--r--libc/arch-x86/syscalls/faccessat.S4
-rw-r--r--libc/arch-x86/syscalls/fchdir.S4
-rw-r--r--libc/arch-x86/syscalls/fchmod.S4
-rw-r--r--libc/arch-x86/syscalls/fchmodat.S4
-rw-r--r--libc/arch-x86/syscalls/fchown.S4
-rw-r--r--libc/arch-x86/syscalls/fchownat.S4
-rw-r--r--libc/arch-x86/syscalls/fdatasync.S4
-rw-r--r--libc/arch-x86/syscalls/fgetxattr.S4
-rw-r--r--libc/arch-x86/syscalls/flistxattr.S4
-rw-r--r--libc/arch-x86/syscalls/flock.S4
-rw-r--r--libc/arch-x86/syscalls/fremovexattr.S4
-rw-r--r--libc/arch-x86/syscalls/fsetxattr.S4
-rw-r--r--libc/arch-x86/syscalls/fstat.S4
-rw-r--r--libc/arch-x86/syscalls/fstatat.S4
-rw-r--r--libc/arch-x86/syscalls/fsync.S4
-rw-r--r--libc/arch-x86/syscalls/ftruncate.S4
-rw-r--r--libc/arch-x86/syscalls/ftruncate64.S4
-rw-r--r--libc/arch-x86/syscalls/futex.S4
-rw-r--r--libc/arch-x86/syscalls/getdents.S4
-rw-r--r--libc/arch-x86/syscalls/getegid.S4
-rw-r--r--libc/arch-x86/syscalls/geteuid.S4
-rw-r--r--libc/arch-x86/syscalls/getgid.S4
-rw-r--r--libc/arch-x86/syscalls/getgroups.S4
-rw-r--r--libc/arch-x86/syscalls/getitimer.S4
-rw-r--r--libc/arch-x86/syscalls/getpeername.S4
-rw-r--r--libc/arch-x86/syscalls/getpgid.S4
-rw-r--r--libc/arch-x86/syscalls/getpid.S4
-rw-r--r--libc/arch-x86/syscalls/getppid.S4
-rw-r--r--libc/arch-x86/syscalls/getresgid.S4
-rw-r--r--libc/arch-x86/syscalls/getresuid.S4
-rw-r--r--libc/arch-x86/syscalls/getrlimit.S4
-rw-r--r--libc/arch-x86/syscalls/getrusage.S4
-rw-r--r--libc/arch-x86/syscalls/getsid.S4
-rw-r--r--libc/arch-x86/syscalls/getsockname.S4
-rw-r--r--libc/arch-x86/syscalls/getsockopt.S4
-rw-r--r--libc/arch-x86/syscalls/gettid.S4
-rw-r--r--libc/arch-x86/syscalls/gettimeofday.S4
-rw-r--r--libc/arch-x86/syscalls/getuid.S4
-rw-r--r--libc/arch-x86/syscalls/getxattr.S4
-rw-r--r--libc/arch-x86/syscalls/init_module.S4
-rw-r--r--libc/arch-x86/syscalls/inotify_add_watch.S4
-rw-r--r--libc/arch-x86/syscalls/inotify_init1.S4
-rw-r--r--libc/arch-x86/syscalls/inotify_rm_watch.S4
-rw-r--r--libc/arch-x86/syscalls/ioprio_get.S4
-rw-r--r--libc/arch-x86/syscalls/ioprio_set.S4
-rw-r--r--libc/arch-x86/syscalls/kill.S4
-rw-r--r--libc/arch-x86/syscalls/klogctl.S4
-rw-r--r--libc/arch-x86/syscalls/lgetxattr.S4
-rw-r--r--libc/arch-x86/syscalls/linkat.S4
-rw-r--r--libc/arch-x86/syscalls/listen.S4
-rw-r--r--libc/arch-x86/syscalls/listxattr.S4
-rw-r--r--libc/arch-x86/syscalls/llistxattr.S4
-rw-r--r--libc/arch-x86/syscalls/lremovexattr.S4
-rw-r--r--libc/arch-x86/syscalls/lseek.S4
-rw-r--r--libc/arch-x86/syscalls/lsetxattr.S4
-rw-r--r--libc/arch-x86/syscalls/madvise.S4
-rw-r--r--libc/arch-x86/syscalls/mincore.S4
-rw-r--r--libc/arch-x86/syscalls/mkdirat.S4
-rw-r--r--libc/arch-x86/syscalls/mknodat.S4
-rw-r--r--libc/arch-x86/syscalls/mlock.S4
-rw-r--r--libc/arch-x86/syscalls/mlockall.S4
-rw-r--r--libc/arch-x86/syscalls/mount.S4
-rw-r--r--libc/arch-x86/syscalls/mprotect.S4
-rw-r--r--libc/arch-x86/syscalls/mremap.S4
-rw-r--r--libc/arch-x86/syscalls/msync.S4
-rw-r--r--libc/arch-x86/syscalls/munlock.S4
-rw-r--r--libc/arch-x86/syscalls/munlockall.S4
-rw-r--r--libc/arch-x86/syscalls/munmap.S4
-rw-r--r--libc/arch-x86/syscalls/nanosleep.S4
-rw-r--r--libc/arch-x86/syscalls/perf_event_open.S4
-rw-r--r--libc/arch-x86/syscalls/personality.S4
-rw-r--r--libc/arch-x86/syscalls/pipe2.S4
-rw-r--r--libc/arch-x86/syscalls/prctl.S4
-rw-r--r--libc/arch-x86/syscalls/pread64.S4
-rw-r--r--libc/arch-x86/syscalls/pwrite64.S4
-rw-r--r--libc/arch-x86/syscalls/read.S4
-rw-r--r--libc/arch-x86/syscalls/readahead.S4
-rw-r--r--libc/arch-x86/syscalls/readlinkat.S4
-rw-r--r--libc/arch-x86/syscalls/readv.S4
-rw-r--r--libc/arch-x86/syscalls/recvfrom.S4
-rw-r--r--libc/arch-x86/syscalls/recvmsg.S4
-rw-r--r--libc/arch-x86/syscalls/removexattr.S4
-rw-r--r--libc/arch-x86/syscalls/renameat.S4
-rw-r--r--libc/arch-x86/syscalls/sched_get_priority_max.S4
-rw-r--r--libc/arch-x86/syscalls/sched_get_priority_min.S4
-rw-r--r--libc/arch-x86/syscalls/sched_getparam.S4
-rw-r--r--libc/arch-x86/syscalls/sched_getscheduler.S4
-rw-r--r--libc/arch-x86/syscalls/sched_rr_get_interval.S4
-rw-r--r--libc/arch-x86/syscalls/sched_setaffinity.S4
-rw-r--r--libc/arch-x86/syscalls/sched_setparam.S4
-rw-r--r--libc/arch-x86/syscalls/sched_setscheduler.S4
-rw-r--r--libc/arch-x86/syscalls/sched_yield.S4
-rw-r--r--libc/arch-x86/syscalls/sendfile.S4
-rw-r--r--libc/arch-x86/syscalls/sendfile64.S4
-rw-r--r--libc/arch-x86/syscalls/sendmsg.S4
-rw-r--r--libc/arch-x86/syscalls/sendto.S4
-rw-r--r--libc/arch-x86/syscalls/setgid.S4
-rw-r--r--libc/arch-x86/syscalls/setgroups.S4
-rw-r--r--libc/arch-x86/syscalls/setitimer.S4
-rw-r--r--libc/arch-x86/syscalls/setpgid.S4
-rw-r--r--libc/arch-x86/syscalls/setpriority.S4
-rw-r--r--libc/arch-x86/syscalls/setregid.S4
-rw-r--r--libc/arch-x86/syscalls/setresgid.S4
-rw-r--r--libc/arch-x86/syscalls/setresuid.S4
-rw-r--r--libc/arch-x86/syscalls/setreuid.S4
-rw-r--r--libc/arch-x86/syscalls/setrlimit.S4
-rw-r--r--libc/arch-x86/syscalls/setsid.S4
-rw-r--r--libc/arch-x86/syscalls/setsockopt.S4
-rw-r--r--libc/arch-x86/syscalls/settimeofday.S4
-rw-r--r--libc/arch-x86/syscalls/setuid.S4
-rw-r--r--libc/arch-x86/syscalls/setxattr.S4
-rw-r--r--libc/arch-x86/syscalls/shutdown.S4
-rw-r--r--libc/arch-x86/syscalls/sigaltstack.S4
-rw-r--r--libc/arch-x86/syscalls/signalfd4.S4
-rw-r--r--libc/arch-x86/syscalls/socket.S4
-rw-r--r--libc/arch-x86/syscalls/socketpair.S4
-rw-r--r--libc/arch-x86/syscalls/swapoff.S4
-rw-r--r--libc/arch-x86/syscalls/swapon.S4
-rw-r--r--libc/arch-x86/syscalls/symlinkat.S4
-rw-r--r--libc/arch-x86/syscalls/sync.S4
-rw-r--r--libc/arch-x86/syscalls/sysinfo.S4
-rw-r--r--libc/arch-x86/syscalls/tgkill.S4
-rw-r--r--libc/arch-x86/syscalls/timerfd_create.S4
-rw-r--r--libc/arch-x86/syscalls/timerfd_gettime.S4
-rw-r--r--libc/arch-x86/syscalls/timerfd_settime.S4
-rw-r--r--libc/arch-x86/syscalls/times.S4
-rw-r--r--libc/arch-x86/syscalls/tkill.S4
-rw-r--r--libc/arch-x86/syscalls/truncate.S4
-rw-r--r--libc/arch-x86/syscalls/truncate64.S4
-rw-r--r--libc/arch-x86/syscalls/umask.S4
-rw-r--r--libc/arch-x86/syscalls/umount2.S4
-rw-r--r--libc/arch-x86/syscalls/uname.S4
-rw-r--r--libc/arch-x86/syscalls/unlinkat.S4
-rw-r--r--libc/arch-x86/syscalls/unshare.S4
-rw-r--r--libc/arch-x86/syscalls/utimensat.S4
-rw-r--r--libc/arch-x86/syscalls/wait4.S4
-rw-r--r--libc/arch-x86/syscalls/write.S4
-rw-r--r--libc/arch-x86/syscalls/writev.S4
-rw-r--r--libc/arch-x86_64/bionic/syscall.S5
-rw-r--r--libc/arch-x86_64/bionic/vfork.S4
-rw-r--r--libc/arch-x86_64/syscalls/__arch_prctl.S4
-rw-r--r--libc/arch-x86_64/syscalls/__brk.S4
-rw-r--r--libc/arch-x86_64/syscalls/__clone.S4
-rw-r--r--libc/arch-x86_64/syscalls/__epoll_pwait.S4
-rw-r--r--libc/arch-x86_64/syscalls/__exit.S4
-rw-r--r--libc/arch-x86_64/syscalls/__getcpu.S4
-rw-r--r--libc/arch-x86_64/syscalls/__getcwd.S4
-rw-r--r--libc/arch-x86_64/syscalls/__getpriority.S4
-rw-r--r--libc/arch-x86_64/syscalls/__ioctl.S4
-rw-r--r--libc/arch-x86_64/syscalls/__openat.S4
-rw-r--r--libc/arch-x86_64/syscalls/__ppoll.S4
-rw-r--r--libc/arch-x86_64/syscalls/__pselect6.S4
-rw-r--r--libc/arch-x86_64/syscalls/__ptrace.S4
-rw-r--r--libc/arch-x86_64/syscalls/__reboot.S4
-rw-r--r--libc/arch-x86_64/syscalls/__rt_sigaction.S4
-rw-r--r--libc/arch-x86_64/syscalls/__rt_sigpending.S4
-rw-r--r--libc/arch-x86_64/syscalls/__rt_sigprocmask.S4
-rw-r--r--libc/arch-x86_64/syscalls/__rt_sigsuspend.S4
-rw-r--r--libc/arch-x86_64/syscalls/__rt_sigtimedwait.S4
-rw-r--r--libc/arch-x86_64/syscalls/__sched_getaffinity.S4
-rw-r--r--libc/arch-x86_64/syscalls/__syslog.S4
-rw-r--r--libc/arch-x86_64/syscalls/__timer_create.S4
-rw-r--r--libc/arch-x86_64/syscalls/__timer_delete.S4
-rw-r--r--libc/arch-x86_64/syscalls/__timer_getoverrun.S4
-rw-r--r--libc/arch-x86_64/syscalls/__timer_gettime.S4
-rw-r--r--libc/arch-x86_64/syscalls/__timer_settime.S4
-rw-r--r--libc/arch-x86_64/syscalls/__waitid.S4
-rw-r--r--libc/arch-x86_64/syscalls/_exit.S4
-rw-r--r--libc/arch-x86_64/syscalls/accept.S4
-rw-r--r--libc/arch-x86_64/syscalls/acct.S4
-rw-r--r--libc/arch-x86_64/syscalls/bind.S4
-rw-r--r--libc/arch-x86_64/syscalls/capget.S4
-rw-r--r--libc/arch-x86_64/syscalls/capset.S4
-rw-r--r--libc/arch-x86_64/syscalls/chdir.S4
-rw-r--r--libc/arch-x86_64/syscalls/chroot.S4
-rw-r--r--libc/arch-x86_64/syscalls/clock_getres.S4
-rw-r--r--libc/arch-x86_64/syscalls/clock_gettime.S4
-rw-r--r--libc/arch-x86_64/syscalls/clock_nanosleep.S4
-rw-r--r--libc/arch-x86_64/syscalls/clock_settime.S4
-rw-r--r--libc/arch-x86_64/syscalls/close.S4
-rw-r--r--libc/arch-x86_64/syscalls/connect.S4
-rw-r--r--libc/arch-x86_64/syscalls/delete_module.S4
-rw-r--r--libc/arch-x86_64/syscalls/dup.S4
-rw-r--r--libc/arch-x86_64/syscalls/dup3.S4
-rw-r--r--libc/arch-x86_64/syscalls/epoll_create1.S4
-rw-r--r--libc/arch-x86_64/syscalls/epoll_ctl.S4
-rw-r--r--libc/arch-x86_64/syscalls/eventfd.S4
-rw-r--r--libc/arch-x86_64/syscalls/execve.S4
-rw-r--r--libc/arch-x86_64/syscalls/faccessat.S4
-rw-r--r--libc/arch-x86_64/syscalls/fchdir.S4
-rw-r--r--libc/arch-x86_64/syscalls/fchmod.S4
-rw-r--r--libc/arch-x86_64/syscalls/fchmodat.S4
-rw-r--r--libc/arch-x86_64/syscalls/fchown.S4
-rw-r--r--libc/arch-x86_64/syscalls/fchownat.S4
-rw-r--r--libc/arch-x86_64/syscalls/fcntl.S4
-rw-r--r--libc/arch-x86_64/syscalls/fdatasync.S4
-rw-r--r--libc/arch-x86_64/syscalls/fgetxattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/flistxattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/flock.S4
-rw-r--r--libc/arch-x86_64/syscalls/fremovexattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/fsetxattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/fstat.S4
-rw-r--r--libc/arch-x86_64/syscalls/fstatat.S4
-rw-r--r--libc/arch-x86_64/syscalls/fstatfs.S4
-rw-r--r--libc/arch-x86_64/syscalls/fsync.S4
-rw-r--r--libc/arch-x86_64/syscalls/ftruncate.S4
-rw-r--r--libc/arch-x86_64/syscalls/futex.S4
-rw-r--r--libc/arch-x86_64/syscalls/getdents.S4
-rw-r--r--libc/arch-x86_64/syscalls/getegid.S4
-rw-r--r--libc/arch-x86_64/syscalls/geteuid.S4
-rw-r--r--libc/arch-x86_64/syscalls/getgid.S4
-rw-r--r--libc/arch-x86_64/syscalls/getgroups.S4
-rw-r--r--libc/arch-x86_64/syscalls/getitimer.S4
-rw-r--r--libc/arch-x86_64/syscalls/getpeername.S4
-rw-r--r--libc/arch-x86_64/syscalls/getpgid.S4
-rw-r--r--libc/arch-x86_64/syscalls/getpid.S4
-rw-r--r--libc/arch-x86_64/syscalls/getppid.S4
-rw-r--r--libc/arch-x86_64/syscalls/getresgid.S4
-rw-r--r--libc/arch-x86_64/syscalls/getresuid.S4
-rw-r--r--libc/arch-x86_64/syscalls/getrlimit.S4
-rw-r--r--libc/arch-x86_64/syscalls/getrusage.S4
-rw-r--r--libc/arch-x86_64/syscalls/getsid.S4
-rw-r--r--libc/arch-x86_64/syscalls/getsockname.S4
-rw-r--r--libc/arch-x86_64/syscalls/getsockopt.S4
-rw-r--r--libc/arch-x86_64/syscalls/gettid.S4
-rw-r--r--libc/arch-x86_64/syscalls/gettimeofday.S4
-rw-r--r--libc/arch-x86_64/syscalls/getuid.S4
-rw-r--r--libc/arch-x86_64/syscalls/getxattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/init_module.S4
-rw-r--r--libc/arch-x86_64/syscalls/inotify_add_watch.S4
-rw-r--r--libc/arch-x86_64/syscalls/inotify_init1.S4
-rw-r--r--libc/arch-x86_64/syscalls/inotify_rm_watch.S4
-rw-r--r--libc/arch-x86_64/syscalls/ioprio_get.S4
-rw-r--r--libc/arch-x86_64/syscalls/ioprio_set.S4
-rw-r--r--libc/arch-x86_64/syscalls/kill.S4
-rw-r--r--libc/arch-x86_64/syscalls/klogctl.S4
-rw-r--r--libc/arch-x86_64/syscalls/lgetxattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/linkat.S4
-rw-r--r--libc/arch-x86_64/syscalls/listen.S4
-rw-r--r--libc/arch-x86_64/syscalls/listxattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/llistxattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/lremovexattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/lseek.S4
-rw-r--r--libc/arch-x86_64/syscalls/lsetxattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/madvise.S4
-rw-r--r--libc/arch-x86_64/syscalls/mincore.S4
-rw-r--r--libc/arch-x86_64/syscalls/mkdirat.S4
-rw-r--r--libc/arch-x86_64/syscalls/mknodat.S4
-rw-r--r--libc/arch-x86_64/syscalls/mlock.S4
-rw-r--r--libc/arch-x86_64/syscalls/mlockall.S4
-rw-r--r--libc/arch-x86_64/syscalls/mmap.S4
-rw-r--r--libc/arch-x86_64/syscalls/mount.S4
-rw-r--r--libc/arch-x86_64/syscalls/mprotect.S4
-rw-r--r--libc/arch-x86_64/syscalls/mremap.S4
-rw-r--r--libc/arch-x86_64/syscalls/msync.S4
-rw-r--r--libc/arch-x86_64/syscalls/munlock.S4
-rw-r--r--libc/arch-x86_64/syscalls/munlockall.S4
-rw-r--r--libc/arch-x86_64/syscalls/munmap.S4
-rw-r--r--libc/arch-x86_64/syscalls/nanosleep.S4
-rw-r--r--libc/arch-x86_64/syscalls/perf_event_open.S4
-rw-r--r--libc/arch-x86_64/syscalls/personality.S4
-rw-r--r--libc/arch-x86_64/syscalls/pipe2.S4
-rw-r--r--libc/arch-x86_64/syscalls/prctl.S4
-rw-r--r--libc/arch-x86_64/syscalls/pread64.S4
-rw-r--r--libc/arch-x86_64/syscalls/pwrite64.S4
-rw-r--r--libc/arch-x86_64/syscalls/read.S4
-rw-r--r--libc/arch-x86_64/syscalls/readahead.S4
-rw-r--r--libc/arch-x86_64/syscalls/readlinkat.S4
-rw-r--r--libc/arch-x86_64/syscalls/readv.S4
-rw-r--r--libc/arch-x86_64/syscalls/recvfrom.S4
-rw-r--r--libc/arch-x86_64/syscalls/recvmsg.S4
-rw-r--r--libc/arch-x86_64/syscalls/removexattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/renameat.S4
-rw-r--r--libc/arch-x86_64/syscalls/sched_get_priority_max.S4
-rw-r--r--libc/arch-x86_64/syscalls/sched_get_priority_min.S4
-rw-r--r--libc/arch-x86_64/syscalls/sched_getparam.S4
-rw-r--r--libc/arch-x86_64/syscalls/sched_getscheduler.S4
-rw-r--r--libc/arch-x86_64/syscalls/sched_rr_get_interval.S4
-rw-r--r--libc/arch-x86_64/syscalls/sched_setaffinity.S4
-rw-r--r--libc/arch-x86_64/syscalls/sched_setparam.S4
-rw-r--r--libc/arch-x86_64/syscalls/sched_setscheduler.S4
-rw-r--r--libc/arch-x86_64/syscalls/sched_yield.S4
-rw-r--r--libc/arch-x86_64/syscalls/sendfile.S4
-rw-r--r--libc/arch-x86_64/syscalls/sendmsg.S4
-rw-r--r--libc/arch-x86_64/syscalls/sendto.S4
-rw-r--r--libc/arch-x86_64/syscalls/setgid.S4
-rw-r--r--libc/arch-x86_64/syscalls/setgroups.S4
-rw-r--r--libc/arch-x86_64/syscalls/setitimer.S4
-rw-r--r--libc/arch-x86_64/syscalls/setpgid.S4
-rw-r--r--libc/arch-x86_64/syscalls/setpriority.S4
-rw-r--r--libc/arch-x86_64/syscalls/setregid.S4
-rw-r--r--libc/arch-x86_64/syscalls/setresgid.S4
-rw-r--r--libc/arch-x86_64/syscalls/setresuid.S4
-rw-r--r--libc/arch-x86_64/syscalls/setreuid.S4
-rw-r--r--libc/arch-x86_64/syscalls/setrlimit.S4
-rw-r--r--libc/arch-x86_64/syscalls/setsid.S4
-rw-r--r--libc/arch-x86_64/syscalls/setsockopt.S4
-rw-r--r--libc/arch-x86_64/syscalls/settimeofday.S4
-rw-r--r--libc/arch-x86_64/syscalls/setuid.S4
-rw-r--r--libc/arch-x86_64/syscalls/setxattr.S4
-rw-r--r--libc/arch-x86_64/syscalls/shutdown.S4
-rw-r--r--libc/arch-x86_64/syscalls/sigaltstack.S4
-rw-r--r--libc/arch-x86_64/syscalls/signalfd4.S4
-rw-r--r--libc/arch-x86_64/syscalls/socket.S4
-rw-r--r--libc/arch-x86_64/syscalls/socketpair.S4
-rw-r--r--libc/arch-x86_64/syscalls/statfs.S4
-rw-r--r--libc/arch-x86_64/syscalls/swapoff.S4
-rw-r--r--libc/arch-x86_64/syscalls/swapon.S4
-rw-r--r--libc/arch-x86_64/syscalls/symlinkat.S4
-rw-r--r--libc/arch-x86_64/syscalls/sync.S4
-rw-r--r--libc/arch-x86_64/syscalls/sysinfo.S4
-rw-r--r--libc/arch-x86_64/syscalls/tgkill.S4
-rw-r--r--libc/arch-x86_64/syscalls/timerfd_create.S4
-rw-r--r--libc/arch-x86_64/syscalls/timerfd_gettime.S4
-rw-r--r--libc/arch-x86_64/syscalls/timerfd_settime.S4
-rw-r--r--libc/arch-x86_64/syscalls/times.S4
-rw-r--r--libc/arch-x86_64/syscalls/tkill.S4
-rw-r--r--libc/arch-x86_64/syscalls/truncate.S4
-rw-r--r--libc/arch-x86_64/syscalls/umask.S4
-rw-r--r--libc/arch-x86_64/syscalls/umount2.S4
-rw-r--r--libc/arch-x86_64/syscalls/uname.S4
-rw-r--r--libc/arch-x86_64/syscalls/unlinkat.S4
-rw-r--r--libc/arch-x86_64/syscalls/unshare.S4
-rw-r--r--libc/arch-x86_64/syscalls/utimensat.S4
-rw-r--r--libc/arch-x86_64/syscalls/wait4.S4
-rw-r--r--libc/arch-x86_64/syscalls/write.S4
-rw-r--r--libc/arch-x86_64/syscalls/writev.S4
-rw-r--r--libc/private/bionic_asm.h40
-rwxr-xr-xlibc/tools/gensyscalls.py4
765 files changed, 805 insertions, 2291 deletions
diff --git a/libc/arch-aarch64/syscalls/__brk.S b/libc/arch-aarch64/syscalls/__brk.S
index 91e5ee4b7..98055cc87 100644
--- a/libc/arch-aarch64/syscalls/__brk.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__clone.S b/libc/arch-aarch64/syscalls/__clone.S
index 817ae5851..45c202249 100644
--- a/libc/arch-aarch64/syscalls/__clone.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__epoll_pwait.S b/libc/arch-aarch64/syscalls/__epoll_pwait.S
index b65c5a952..d512c7ce8 100644
--- a/libc/arch-aarch64/syscalls/__epoll_pwait.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__exit.S b/libc/arch-aarch64/syscalls/__exit.S
index 744317687..50cd45a5c 100644
--- a/libc/arch-aarch64/syscalls/__exit.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__getcpu.S b/libc/arch-aarch64/syscalls/__getcpu.S
index 907b76922..698e8ff25 100644
--- a/libc/arch-aarch64/syscalls/__getcpu.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__getcwd.S b/libc/arch-aarch64/syscalls/__getcwd.S
index 723c55007..f0543f010 100644
--- a/libc/arch-aarch64/syscalls/__getcwd.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__getpriority.S b/libc/arch-aarch64/syscalls/__getpriority.S
index c0df90f5e..f7fd1b8a5 100644
--- a/libc/arch-aarch64/syscalls/__getpriority.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__ioctl.S b/libc/arch-aarch64/syscalls/__ioctl.S
index be1ae0d87..2569fdfab 100644
--- a/libc/arch-aarch64/syscalls/__ioctl.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__openat.S b/libc/arch-aarch64/syscalls/__openat.S
index 4a81443a0..cca66ce29 100644
--- a/libc/arch-aarch64/syscalls/__openat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__ppoll.S b/libc/arch-aarch64/syscalls/__ppoll.S
index 985a56920..68efc09f0 100644
--- a/libc/arch-aarch64/syscalls/__ppoll.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__pselect6.S b/libc/arch-aarch64/syscalls/__pselect6.S
index 1f3804803..295b71a50 100644
--- a/libc/arch-aarch64/syscalls/__pselect6.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__ptrace.S b/libc/arch-aarch64/syscalls/__ptrace.S
index 5084dbec0..aa4107185 100644
--- a/libc/arch-aarch64/syscalls/__ptrace.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__reboot.S b/libc/arch-aarch64/syscalls/__reboot.S
index 80cb85567..9680bdc99 100644
--- a/libc/arch-aarch64/syscalls/__reboot.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__rt_sigaction.S b/libc/arch-aarch64/syscalls/__rt_sigaction.S
index 82dc79e8e..77f83eae2 100644
--- a/libc/arch-aarch64/syscalls/__rt_sigaction.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__rt_sigpending.S b/libc/arch-aarch64/syscalls/__rt_sigpending.S
index ace2866ba..59a2e1e1a 100644
--- a/libc/arch-aarch64/syscalls/__rt_sigpending.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__rt_sigprocmask.S b/libc/arch-aarch64/syscalls/__rt_sigprocmask.S
index 31ee86f06..c5a51ede3 100644
--- a/libc/arch-aarch64/syscalls/__rt_sigprocmask.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__rt_sigsuspend.S b/libc/arch-aarch64/syscalls/__rt_sigsuspend.S
index 58f711c42..7a1c22e7b 100644
--- a/libc/arch-aarch64/syscalls/__rt_sigsuspend.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__rt_sigtimedwait.S b/libc/arch-aarch64/syscalls/__rt_sigtimedwait.S
index 748d81b9f..b3d950c8c 100644
--- a/libc/arch-aarch64/syscalls/__rt_sigtimedwait.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__sched_getaffinity.S b/libc/arch-aarch64/syscalls/__sched_getaffinity.S
index 76c51b0e6..9b785adcb 100644
--- a/libc/arch-aarch64/syscalls/__sched_getaffinity.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__syslog.S b/libc/arch-aarch64/syscalls/__syslog.S
index 379926dfe..625a7eb49 100644
--- a/libc/arch-aarch64/syscalls/__syslog.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__timer_create.S b/libc/arch-aarch64/syscalls/__timer_create.S
index cebae7a52..bfce448fc 100644
--- a/libc/arch-aarch64/syscalls/__timer_create.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__timer_delete.S b/libc/arch-aarch64/syscalls/__timer_delete.S
index 06a2ca74c..03ed44e28 100644
--- a/libc/arch-aarch64/syscalls/__timer_delete.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__timer_getoverrun.S b/libc/arch-aarch64/syscalls/__timer_getoverrun.S
index 3e6fbb7cf..a45894139 100644
--- a/libc/arch-aarch64/syscalls/__timer_getoverrun.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__timer_gettime.S b/libc/arch-aarch64/syscalls/__timer_gettime.S
index 41cfcfb43..b6ae29e44 100644
--- a/libc/arch-aarch64/syscalls/__timer_gettime.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__timer_settime.S b/libc/arch-aarch64/syscalls/__timer_settime.S
index 474c98e7c..3c44b5318 100644
--- a/libc/arch-aarch64/syscalls/__timer_settime.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__waitid.S b/libc/arch-aarch64/syscalls/__waitid.S
index 62445ae21..42440184c 100644
--- a/libc/arch-aarch64/syscalls/__waitid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/_exit.S b/libc/arch-aarch64/syscalls/_exit.S
index 9f5644a25..24b7b17d0 100644
--- a/libc/arch-aarch64/syscalls/_exit.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/accept.S b/libc/arch-aarch64/syscalls/accept.S
index add85c8c8..dae6121f2 100644
--- a/libc/arch-aarch64/syscalls/accept.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/acct.S b/libc/arch-aarch64/syscalls/acct.S
index ab4b30dc1..901e4200f 100644
--- a/libc/arch-aarch64/syscalls/acct.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/bind.S b/libc/arch-aarch64/syscalls/bind.S
index 28f192b5e..471d78330 100644
--- a/libc/arch-aarch64/syscalls/bind.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/capget.S b/libc/arch-aarch64/syscalls/capget.S
index fbe2685da..33fe11cc3 100644
--- a/libc/arch-aarch64/syscalls/capget.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/capset.S b/libc/arch-aarch64/syscalls/capset.S
index 2677b1eb0..75f03a91c 100644
--- a/libc/arch-aarch64/syscalls/capset.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/chdir.S b/libc/arch-aarch64/syscalls/chdir.S
index 5480043eb..051f823b2 100644
--- a/libc/arch-aarch64/syscalls/chdir.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/chroot.S b/libc/arch-aarch64/syscalls/chroot.S
index 38ed61e84..c06399fe5 100644
--- a/libc/arch-aarch64/syscalls/chroot.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/clock_getres.S b/libc/arch-aarch64/syscalls/clock_getres.S
index f14213440..bffc7cb8a 100644
--- a/libc/arch-aarch64/syscalls/clock_getres.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/clock_gettime.S b/libc/arch-aarch64/syscalls/clock_gettime.S
index c7581cde9..3c582364a 100644
--- a/libc/arch-aarch64/syscalls/clock_gettime.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/clock_nanosleep.S b/libc/arch-aarch64/syscalls/clock_nanosleep.S
index b942bcc88..357bda606 100644
--- a/libc/arch-aarch64/syscalls/clock_nanosleep.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/clock_settime.S b/libc/arch-aarch64/syscalls/clock_settime.S
index ad8b102df..06e9393ab 100644
--- a/libc/arch-aarch64/syscalls/clock_settime.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/close.S b/libc/arch-aarch64/syscalls/close.S
index 0943cfcc7..fefe147b3 100644
--- a/libc/arch-aarch64/syscalls/close.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/connect.S b/libc/arch-aarch64/syscalls/connect.S
index 4b83c95c9..d3cd43de7 100644
--- a/libc/arch-aarch64/syscalls/connect.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/delete_module.S b/libc/arch-aarch64/syscalls/delete_module.S
index ab471ce5d..4e8b09d20 100644
--- a/libc/arch-aarch64/syscalls/delete_module.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/dup.S b/libc/arch-aarch64/syscalls/dup.S
index 1aa91621f..9dbe56240 100644
--- a/libc/arch-aarch64/syscalls/dup.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/dup3.S b/libc/arch-aarch64/syscalls/dup3.S
index 8bb5925b8..ee044406c 100644
--- a/libc/arch-aarch64/syscalls/dup3.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/epoll_create1.S b/libc/arch-aarch64/syscalls/epoll_create1.S
index 2f38b5db0..0ed34b5ec 100644
--- a/libc/arch-aarch64/syscalls/epoll_create1.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/epoll_ctl.S b/libc/arch-aarch64/syscalls/epoll_ctl.S
index eacf78c4c..a09ba297c 100644
--- a/libc/arch-aarch64/syscalls/epoll_ctl.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/eventfd.S b/libc/arch-aarch64/syscalls/eventfd.S
index 6890b0182..e6b592b21 100644
--- a/libc/arch-aarch64/syscalls/eventfd.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/execve.S b/libc/arch-aarch64/syscalls/execve.S
index 63aaeceda..4f3cdb8e5 100644
--- a/libc/arch-aarch64/syscalls/execve.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/faccessat.S b/libc/arch-aarch64/syscalls/faccessat.S
index 20ac348e3..c6b65579b 100644
--- a/libc/arch-aarch64/syscalls/faccessat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fchdir.S b/libc/arch-aarch64/syscalls/fchdir.S
index 514b139f8..c60823136 100644
--- a/libc/arch-aarch64/syscalls/fchdir.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fchmod.S b/libc/arch-aarch64/syscalls/fchmod.S
index c5345e383..a777cdca6 100644
--- a/libc/arch-aarch64/syscalls/fchmod.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fchmodat.S b/libc/arch-aarch64/syscalls/fchmodat.S
index 02a7f59e9..1a52c9f42 100644
--- a/libc/arch-aarch64/syscalls/fchmodat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fchown.S b/libc/arch-aarch64/syscalls/fchown.S
index adaf5f45f..073e36f2f 100644
--- a/libc/arch-aarch64/syscalls/fchown.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fchownat.S b/libc/arch-aarch64/syscalls/fchownat.S
index 2762c6c67..db80ab111 100644
--- a/libc/arch-aarch64/syscalls/fchownat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fcntl.S b/libc/arch-aarch64/syscalls/fcntl.S
index 5c78747bc..23ce15557 100644
--- a/libc/arch-aarch64/syscalls/fcntl.S
+++ b/libc/arch-aarch64/syscalls/fcntl.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(fcntl)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fdatasync.S b/libc/arch-aarch64/syscalls/fdatasync.S
index 55fe84810..b4e9aa9be 100644
--- a/libc/arch-aarch64/syscalls/fdatasync.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fgetxattr.S b/libc/arch-aarch64/syscalls/fgetxattr.S
index a73fce90d..3278a1217 100644
--- a/libc/arch-aarch64/syscalls/fgetxattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/flistxattr.S b/libc/arch-aarch64/syscalls/flistxattr.S
index e52d1fdbc..40b2a3072 100644
--- a/libc/arch-aarch64/syscalls/flistxattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/flock.S b/libc/arch-aarch64/syscalls/flock.S
index 091c34bbf..7e2878931 100644
--- a/libc/arch-aarch64/syscalls/flock.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fremovexattr.S b/libc/arch-aarch64/syscalls/fremovexattr.S
index 3801f2ea0..be86dd0c8 100644
--- a/libc/arch-aarch64/syscalls/fremovexattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fsetxattr.S b/libc/arch-aarch64/syscalls/fsetxattr.S
index 61170e623..2cb72c99a 100644
--- a/libc/arch-aarch64/syscalls/fsetxattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fstat.S b/libc/arch-aarch64/syscalls/fstat.S
index 09de2e5af..f8aaa4018 100644
--- a/libc/arch-aarch64/syscalls/fstat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fstatat.S b/libc/arch-aarch64/syscalls/fstatat.S
index b668a199a..5de0fa02b 100644
--- a/libc/arch-aarch64/syscalls/fstatat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fstatfs.S b/libc/arch-aarch64/syscalls/fstatfs.S
index 4b179e894..afd887538 100644
--- a/libc/arch-aarch64/syscalls/fstatfs.S
+++ b/libc/arch-aarch64/syscalls/fstatfs.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(fstatfs)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fsync.S b/libc/arch-aarch64/syscalls/fsync.S
index a493f46ec..e1076f243 100644
--- a/libc/arch-aarch64/syscalls/fsync.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/ftruncate.S b/libc/arch-aarch64/syscalls/ftruncate.S
index 3e578a67e..7ed80b936 100644
--- a/libc/arch-aarch64/syscalls/ftruncate.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/futex.S b/libc/arch-aarch64/syscalls/futex.S
index d01441476..5149d6b89 100644
--- a/libc/arch-aarch64/syscalls/futex.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getdents.S b/libc/arch-aarch64/syscalls/getdents.S
index 3af99cef4..56496c2ca 100644
--- a/libc/arch-aarch64/syscalls/getdents.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getegid.S b/libc/arch-aarch64/syscalls/getegid.S
index 5c12eb805..144fe88f2 100644
--- a/libc/arch-aarch64/syscalls/getegid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/geteuid.S b/libc/arch-aarch64/syscalls/geteuid.S
index 23ccc9a23..fcec9777b 100644
--- a/libc/arch-aarch64/syscalls/geteuid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getgid.S b/libc/arch-aarch64/syscalls/getgid.S
index 21ae633e3..0fd172ef8 100644
--- a/libc/arch-aarch64/syscalls/getgid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getgroups.S b/libc/arch-aarch64/syscalls/getgroups.S
index 3c6987be2..3c12ef46d 100644
--- a/libc/arch-aarch64/syscalls/getgroups.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getitimer.S b/libc/arch-aarch64/syscalls/getitimer.S
index b02ae7586..d795cd73d 100644
--- a/libc/arch-aarch64/syscalls/getitimer.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getpeername.S b/libc/arch-aarch64/syscalls/getpeername.S
index 2cb4841e3..aea3122cc 100644
--- a/libc/arch-aarch64/syscalls/getpeername.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getpgid.S b/libc/arch-aarch64/syscalls/getpgid.S
index a75ac5bb7..1bda83fdd 100644
--- a/libc/arch-aarch64/syscalls/getpgid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getpid.S b/libc/arch-aarch64/syscalls/getpid.S
index 75835da72..3a408c839 100644
--- a/libc/arch-aarch64/syscalls/getpid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getppid.S b/libc/arch-aarch64/syscalls/getppid.S
index 63f775834..1b85cef3c 100644
--- a/libc/arch-aarch64/syscalls/getppid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getresgid.S b/libc/arch-aarch64/syscalls/getresgid.S
index ec1aefbe7..ab00b064b 100644
--- a/libc/arch-aarch64/syscalls/getresgid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getresuid.S b/libc/arch-aarch64/syscalls/getresuid.S
index d0093a452..0ff218a17 100644
--- a/libc/arch-aarch64/syscalls/getresuid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getrlimit.S b/libc/arch-aarch64/syscalls/getrlimit.S
index 713d62c78..8b6548fb2 100644
--- a/libc/arch-aarch64/syscalls/getrlimit.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getrusage.S b/libc/arch-aarch64/syscalls/getrusage.S
index 10a3c1b59..5e2bace0e 100644
--- a/libc/arch-aarch64/syscalls/getrusage.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getsid.S b/libc/arch-aarch64/syscalls/getsid.S
index 8ec4dc62e..c85ca6002 100644
--- a/libc/arch-aarch64/syscalls/getsid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getsockname.S b/libc/arch-aarch64/syscalls/getsockname.S
index d14ca672e..1d0279ab0 100644
--- a/libc/arch-aarch64/syscalls/getsockname.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getsockopt.S b/libc/arch-aarch64/syscalls/getsockopt.S
index ec9257f4c..3bfd5b8aa 100644
--- a/libc/arch-aarch64/syscalls/getsockopt.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/gettid.S b/libc/arch-aarch64/syscalls/gettid.S
index 0fe02b60b..d8c128eca 100644
--- a/libc/arch-aarch64/syscalls/gettid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/gettimeofday.S b/libc/arch-aarch64/syscalls/gettimeofday.S
index e13192855..4f9ac28f7 100644
--- a/libc/arch-aarch64/syscalls/gettimeofday.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getuid.S b/libc/arch-aarch64/syscalls/getuid.S
index 9fa6b52d6..96198b7a8 100644
--- a/libc/arch-aarch64/syscalls/getuid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getxattr.S b/libc/arch-aarch64/syscalls/getxattr.S
index 2e5a303c3..11b90aa0c 100644
--- a/libc/arch-aarch64/syscalls/getxattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/init_module.S b/libc/arch-aarch64/syscalls/init_module.S
index 79ab90dc7..8648b04cd 100644
--- a/libc/arch-aarch64/syscalls/init_module.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/inotify_add_watch.S b/libc/arch-aarch64/syscalls/inotify_add_watch.S
index 0baac5d29..583ab7203 100644
--- a/libc/arch-aarch64/syscalls/inotify_add_watch.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/inotify_init1.S b/libc/arch-aarch64/syscalls/inotify_init1.S
index b94313695..3ee946e29 100644
--- a/libc/arch-aarch64/syscalls/inotify_init1.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/inotify_rm_watch.S b/libc/arch-aarch64/syscalls/inotify_rm_watch.S
index 10c7f569a..3121b5135 100644
--- a/libc/arch-aarch64/syscalls/inotify_rm_watch.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/ioprio_get.S b/libc/arch-aarch64/syscalls/ioprio_get.S
index 7bf536b54..207a4e75a 100644
--- a/libc/arch-aarch64/syscalls/ioprio_get.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/ioprio_set.S b/libc/arch-aarch64/syscalls/ioprio_set.S
index be930b3a8..eb7b0265e 100644
--- a/libc/arch-aarch64/syscalls/ioprio_set.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/kill.S b/libc/arch-aarch64/syscalls/kill.S
index afab1e372..3788df797 100644
--- a/libc/arch-aarch64/syscalls/kill.S
+++ b/libc/arch-aarch64/syscalls/kill.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(kill)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/klogctl.S b/libc/arch-aarch64/syscalls/klogctl.S
index 25fe4156f..efa8b4ab3 100644
--- a/libc/arch-aarch64/syscalls/klogctl.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/lgetxattr.S b/libc/arch-aarch64/syscalls/lgetxattr.S
index 5a2d6102c..1fda092cf 100644
--- a/libc/arch-aarch64/syscalls/lgetxattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/linkat.S b/libc/arch-aarch64/syscalls/linkat.S
index a8fb0fd95..999c00739 100644
--- a/libc/arch-aarch64/syscalls/linkat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/listen.S b/libc/arch-aarch64/syscalls/listen.S
index a90faa4b2..8b7fa0fb4 100644
--- a/libc/arch-aarch64/syscalls/listen.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/listxattr.S b/libc/arch-aarch64/syscalls/listxattr.S
index 972a9c4f1..cc399a95a 100644
--- a/libc/arch-aarch64/syscalls/listxattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/llistxattr.S b/libc/arch-aarch64/syscalls/llistxattr.S
index 28039d265..87bfe10c3 100644
--- a/libc/arch-aarch64/syscalls/llistxattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/lremovexattr.S b/libc/arch-aarch64/syscalls/lremovexattr.S
index 6ff1a162a..ad823e448 100644
--- a/libc/arch-aarch64/syscalls/lremovexattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/lseek.S b/libc/arch-aarch64/syscalls/lseek.S
index f6ffba9c0..867bb715f 100644
--- a/libc/arch-aarch64/syscalls/lseek.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/lsetxattr.S b/libc/arch-aarch64/syscalls/lsetxattr.S
index 3be465b08..683fc2bb1 100644
--- a/libc/arch-aarch64/syscalls/lsetxattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/madvise.S b/libc/arch-aarch64/syscalls/madvise.S
index 7ec35966c..8136ec964 100644
--- a/libc/arch-aarch64/syscalls/madvise.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mincore.S b/libc/arch-aarch64/syscalls/mincore.S
index 9e9befe2b..8a8e5a56b 100644
--- a/libc/arch-aarch64/syscalls/mincore.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mkdirat.S b/libc/arch-aarch64/syscalls/mkdirat.S
index bf1f2ae34..b3dd83885 100644
--- a/libc/arch-aarch64/syscalls/mkdirat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mknodat.S b/libc/arch-aarch64/syscalls/mknodat.S
index 5aa907d5d..aca678616 100644
--- a/libc/arch-aarch64/syscalls/mknodat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mlock.S b/libc/arch-aarch64/syscalls/mlock.S
index be463e6ae..bb014357e 100644
--- a/libc/arch-aarch64/syscalls/mlock.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mlockall.S b/libc/arch-aarch64/syscalls/mlockall.S
index 75d126761..278e6d348 100644
--- a/libc/arch-aarch64/syscalls/mlockall.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mmap.S b/libc/arch-aarch64/syscalls/mmap.S
index d5b597b8d..d9abd411a 100644
--- a/libc/arch-aarch64/syscalls/mmap.S
+++ b/libc/arch-aarch64/syscalls/mmap.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(mmap)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mount.S b/libc/arch-aarch64/syscalls/mount.S
index 0dd0b712e..d88a54b3d 100644
--- a/libc/arch-aarch64/syscalls/mount.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mprotect.S b/libc/arch-aarch64/syscalls/mprotect.S
index 0648c8200..c8a2efe46 100644
--- a/libc/arch-aarch64/syscalls/mprotect.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mremap.S b/libc/arch-aarch64/syscalls/mremap.S
index 8f94e976d..7c7fe5b99 100644
--- a/libc/arch-aarch64/syscalls/mremap.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/msync.S b/libc/arch-aarch64/syscalls/msync.S
index c11fc557b..b45c99d8d 100644
--- a/libc/arch-aarch64/syscalls/msync.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/munlock.S b/libc/arch-aarch64/syscalls/munlock.S
index ec21f0d8b..d84b8503a 100644
--- a/libc/arch-aarch64/syscalls/munlock.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/munlockall.S b/libc/arch-aarch64/syscalls/munlockall.S
index a596573f3..e043f715a 100644
--- a/libc/arch-aarch64/syscalls/munlockall.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/munmap.S b/libc/arch-aarch64/syscalls/munmap.S
index 6f29fa4cc..02afbe858 100644
--- a/libc/arch-aarch64/syscalls/munmap.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/nanosleep.S b/libc/arch-aarch64/syscalls/nanosleep.S
index e42b11d19..8cd9a95c1 100644
--- a/libc/arch-aarch64/syscalls/nanosleep.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/perf_event_open.S b/libc/arch-aarch64/syscalls/perf_event_open.S
index 165746f99..396026492 100644
--- a/libc/arch-aarch64/syscalls/perf_event_open.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/personality.S b/libc/arch-aarch64/syscalls/personality.S
index b718852af..2535467fa 100644
--- a/libc/arch-aarch64/syscalls/personality.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/pipe2.S b/libc/arch-aarch64/syscalls/pipe2.S
index 8b643c7e5..f72e707f2 100644
--- a/libc/arch-aarch64/syscalls/pipe2.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/prctl.S b/libc/arch-aarch64/syscalls/prctl.S
index faf273517..79b3e9271 100644
--- a/libc/arch-aarch64/syscalls/prctl.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/pread64.S b/libc/arch-aarch64/syscalls/pread64.S
index 941e55ff6..0d098f17b 100644
--- a/libc/arch-aarch64/syscalls/pread64.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/pwrite64.S b/libc/arch-aarch64/syscalls/pwrite64.S
index 9700aa3f9..a10f76f66 100644
--- a/libc/arch-aarch64/syscalls/pwrite64.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/read.S b/libc/arch-aarch64/syscalls/read.S
index 475ab72e7..cf7ca0465 100644
--- a/libc/arch-aarch64/syscalls/read.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/readahead.S b/libc/arch-aarch64/syscalls/readahead.S
index eb76fb51d..fe45cf9a0 100644
--- a/libc/arch-aarch64/syscalls/readahead.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/readlinkat.S b/libc/arch-aarch64/syscalls/readlinkat.S
index 1ed549538..eb8221cb5 100644
--- a/libc/arch-aarch64/syscalls/readlinkat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/readv.S b/libc/arch-aarch64/syscalls/readv.S
index 7279a4c80..f4fa61290 100644
--- a/libc/arch-aarch64/syscalls/readv.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/recvfrom.S b/libc/arch-aarch64/syscalls/recvfrom.S
index b0759a850..51ac25f94 100644
--- a/libc/arch-aarch64/syscalls/recvfrom.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/recvmsg.S b/libc/arch-aarch64/syscalls/recvmsg.S
index b40d927ec..4ca40ea6e 100644
--- a/libc/arch-aarch64/syscalls/recvmsg.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/removexattr.S b/libc/arch-aarch64/syscalls/removexattr.S
index 3394cc63b..ae533075b 100644
--- a/libc/arch-aarch64/syscalls/removexattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/renameat.S b/libc/arch-aarch64/syscalls/renameat.S
index 567c75a6d..3f6e4d416 100644
--- a/libc/arch-aarch64/syscalls/renameat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_get_priority_max.S b/libc/arch-aarch64/syscalls/sched_get_priority_max.S
index 2e3408092..735ca9385 100644
--- a/libc/arch-aarch64/syscalls/sched_get_priority_max.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_get_priority_min.S b/libc/arch-aarch64/syscalls/sched_get_priority_min.S
index 3347aa5d9..a453b0b8f 100644
--- a/libc/arch-aarch64/syscalls/sched_get_priority_min.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_getparam.S b/libc/arch-aarch64/syscalls/sched_getparam.S
index 723a13193..f3492b9e4 100644
--- a/libc/arch-aarch64/syscalls/sched_getparam.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_getscheduler.S b/libc/arch-aarch64/syscalls/sched_getscheduler.S
index fbaddc79a..db944f163 100644
--- a/libc/arch-aarch64/syscalls/sched_getscheduler.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_rr_get_interval.S b/libc/arch-aarch64/syscalls/sched_rr_get_interval.S
index e2a49524d..b91f6463e 100644
--- a/libc/arch-aarch64/syscalls/sched_rr_get_interval.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_setaffinity.S b/libc/arch-aarch64/syscalls/sched_setaffinity.S
index 7c1aec7fb..e8e1aec48 100644
--- a/libc/arch-aarch64/syscalls/sched_setaffinity.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_setparam.S b/libc/arch-aarch64/syscalls/sched_setparam.S
index 309a07d3f..5df84f0ab 100644
--- a/libc/arch-aarch64/syscalls/sched_setparam.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_setscheduler.S b/libc/arch-aarch64/syscalls/sched_setscheduler.S
index 8a6d6fe1f..83c31e40b 100644
--- a/libc/arch-aarch64/syscalls/sched_setscheduler.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_yield.S b/libc/arch-aarch64/syscalls/sched_yield.S
index a61979a40..7d5f88b8b 100644
--- a/libc/arch-aarch64/syscalls/sched_yield.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sendfile.S b/libc/arch-aarch64/syscalls/sendfile.S
index 9ae7a9a5d..e54029662 100644
--- a/libc/arch-aarch64/syscalls/sendfile.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sendmsg.S b/libc/arch-aarch64/syscalls/sendmsg.S
index bd33724b3..2f0cdc80f 100644
--- a/libc/arch-aarch64/syscalls/sendmsg.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sendto.S b/libc/arch-aarch64/syscalls/sendto.S
index 44887e0bf..3fd54d10b 100644
--- a/libc/arch-aarch64/syscalls/sendto.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setgid.S b/libc/arch-aarch64/syscalls/setgid.S
index fb7815725..0a811b0c2 100644
--- a/libc/arch-aarch64/syscalls/setgid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setgroups.S b/libc/arch-aarch64/syscalls/setgroups.S
index 81d2b1974..d316e5ed6 100644
--- a/libc/arch-aarch64/syscalls/setgroups.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setitimer.S b/libc/arch-aarch64/syscalls/setitimer.S
index aa0c0c2f2..7c2b718b3 100644
--- a/libc/arch-aarch64/syscalls/setitimer.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setpgid.S b/libc/arch-aarch64/syscalls/setpgid.S
index 6d14cd9a2..bd12e7024 100644
--- a/libc/arch-aarch64/syscalls/setpgid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setpriority.S b/libc/arch-aarch64/syscalls/setpriority.S
index 47da6b4e3..d9a4857e6 100644
--- a/libc/arch-aarch64/syscalls/setpriority.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setregid.S b/libc/arch-aarch64/syscalls/setregid.S
index d3e0f4b5d..702ae8b62 100644
--- a/libc/arch-aarch64/syscalls/setregid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setresgid.S b/libc/arch-aarch64/syscalls/setresgid.S
index 720b7211f..c9501ac76 100644
--- a/libc/arch-aarch64/syscalls/setresgid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setresuid.S b/libc/arch-aarch64/syscalls/setresuid.S
index e2eb626bd..6f680c354 100644
--- a/libc/arch-aarch64/syscalls/setresuid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setreuid.S b/libc/arch-aarch64/syscalls/setreuid.S
index dc66ce8fa..ef870fab9 100644
--- a/libc/arch-aarch64/syscalls/setreuid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setrlimit.S b/libc/arch-aarch64/syscalls/setrlimit.S
index 57358ac83..3591a8454 100644
--- a/libc/arch-aarch64/syscalls/setrlimit.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setsid.S b/libc/arch-aarch64/syscalls/setsid.S
index 26d003ade..c9ba594a9 100644
--- a/libc/arch-aarch64/syscalls/setsid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setsockopt.S b/libc/arch-aarch64/syscalls/setsockopt.S
index d11f96b77..7c9d58422 100644
--- a/libc/arch-aarch64/syscalls/setsockopt.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/settimeofday.S b/libc/arch-aarch64/syscalls/settimeofday.S
index 180436db3..4cf6ff250 100644
--- a/libc/arch-aarch64/syscalls/settimeofday.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setuid.S b/libc/arch-aarch64/syscalls/setuid.S
index 7fafb4e29..a886c15cf 100644
--- a/libc/arch-aarch64/syscalls/setuid.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setxattr.S b/libc/arch-aarch64/syscalls/setxattr.S
index 40ad28f84..1d25f3a67 100644
--- a/libc/arch-aarch64/syscalls/setxattr.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/shutdown.S b/libc/arch-aarch64/syscalls/shutdown.S
index 8136861b2..b9fc3c3ea 100644
--- a/libc/arch-aarch64/syscalls/shutdown.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sigaltstack.S b/libc/arch-aarch64/syscalls/sigaltstack.S
index 62a9fb973..6052caa96 100644
--- a/libc/arch-aarch64/syscalls/sigaltstack.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/signalfd4.S b/libc/arch-aarch64/syscalls/signalfd4.S
index 83644b8f4..7a8f7f708 100644
--- a/libc/arch-aarch64/syscalls/signalfd4.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/socket.S b/libc/arch-aarch64/syscalls/socket.S
index 29e229969..37a385171 100644
--- a/libc/arch-aarch64/syscalls/socket.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/socketpair.S b/libc/arch-aarch64/syscalls/socketpair.S
index 6e985c013..05e617bc9 100644
--- a/libc/arch-aarch64/syscalls/socketpair.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/statfs.S b/libc/arch-aarch64/syscalls/statfs.S
index 1647e6024..9bfae6343 100644
--- a/libc/arch-aarch64/syscalls/statfs.S
+++ b/libc/arch-aarch64/syscalls/statfs.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(statfs)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/swapoff.S b/libc/arch-aarch64/syscalls/swapoff.S
index 60f992763..742b460ea 100644
--- a/libc/arch-aarch64/syscalls/swapoff.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/swapon.S b/libc/arch-aarch64/syscalls/swapon.S
index 176ff5863..b82d7de28 100644
--- a/libc/arch-aarch64/syscalls/swapon.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/symlinkat.S b/libc/arch-aarch64/syscalls/symlinkat.S
index 1e3c7f965..c6a831386 100644
--- a/libc/arch-aarch64/syscalls/symlinkat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sync.S b/libc/arch-aarch64/syscalls/sync.S
index 24b569036..1954fe8c4 100644
--- a/libc/arch-aarch64/syscalls/sync.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sysinfo.S b/libc/arch-aarch64/syscalls/sysinfo.S
index 0bae44664..cb915503c 100644
--- a/libc/arch-aarch64/syscalls/sysinfo.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/tgkill.S b/libc/arch-aarch64/syscalls/tgkill.S
index 1c382b2ef..a4018195f 100644
--- a/libc/arch-aarch64/syscalls/tgkill.S
+++ b/libc/arch-aarch64/syscalls/tgkill.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(tgkill)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/timerfd_create.S b/libc/arch-aarch64/syscalls/timerfd_create.S
index a1cd44e9a..e0558bed4 100644
--- a/libc/arch-aarch64/syscalls/timerfd_create.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/timerfd_gettime.S b/libc/arch-aarch64/syscalls/timerfd_gettime.S
index c8c213d32..09234cd5e 100644
--- a/libc/arch-aarch64/syscalls/timerfd_gettime.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/timerfd_settime.S b/libc/arch-aarch64/syscalls/timerfd_settime.S
index 6963a096b..cc205adda 100644
--- a/libc/arch-aarch64/syscalls/timerfd_settime.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/times.S b/libc/arch-aarch64/syscalls/times.S
index dfd7db10c..c5fe38b8b 100644
--- a/libc/arch-aarch64/syscalls/times.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/tkill.S b/libc/arch-aarch64/syscalls/tkill.S
index 7e5e5bbd1..0b910fcea 100644
--- a/libc/arch-aarch64/syscalls/tkill.S
+++ b/libc/arch-aarch64/syscalls/tkill.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(tkill)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/truncate.S b/libc/arch-aarch64/syscalls/truncate.S
index db5a2f365..f254c342b 100644
--- a/libc/arch-aarch64/syscalls/truncate.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/umask.S b/libc/arch-aarch64/syscalls/umask.S
index 16d48ac56..70a3e0179 100644
--- a/libc/arch-aarch64/syscalls/umask.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/umount2.S b/libc/arch-aarch64/syscalls/umount2.S
index 0079e6df7..cdd03629a 100644
--- a/libc/arch-aarch64/syscalls/umount2.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/uname.S b/libc/arch-aarch64/syscalls/uname.S
index 36b5cc83b..c2427868b 100644
--- a/libc/arch-aarch64/syscalls/uname.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/unlinkat.S b/libc/arch-aarch64/syscalls/unlinkat.S
index 3a7c78fe0..f7bb2c5cf 100644
--- a/libc/arch-aarch64/syscalls/unlinkat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/unshare.S b/libc/arch-aarch64/syscalls/unshare.S
index c69c7da93..c9bd497a7 100644
--- a/libc/arch-aarch64/syscalls/unshare.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/utimensat.S b/libc/arch-aarch64/syscalls/utimensat.S
index 83f1141b2..62c98a641 100644
--- a/libc/arch-aarch64/syscalls/utimensat.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/wait4.S b/libc/arch-aarch64/syscalls/wait4.S
index cf723b30f..743153580 100644
--- a/libc/arch-aarch64/syscalls/wait4.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/write.S b/libc/arch-aarch64/syscalls/write.S
index 15b17c80a..2f95f5d4a 100644
--- a/libc/arch-aarch64/syscalls/write.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/writev.S b/libc/arch-aarch64/syscalls/writev.S
index fe802af3a..015c1d37a 100644
--- a/libc/arch-aarch64/syscalls/writev.S
+++ b/libc/arch-aarch64/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)
stp x29, x30, [sp, #-16]!
diff --git a/libc/arch-arm/bionic/clone.S b/libc/arch-arm/bionic/clone.S
index d00b6a60b..3556b8ed4 100644
--- a/libc/arch-arm/bionic/clone.S
+++ b/libc/arch-arm/bionic/clone.S
@@ -26,9 +26,7 @@
* SUCH DAMAGE.
*/
-#include <linux/err.h>
-#include <machine/asm.h>
-#include <asm/unistd.h>
+#include <private/bionic_asm.h>
// int __pthread_clone(void* (*fn)(void*), void* child_stack, int flags, void* arg);
ENTRY(__pthread_clone)
diff --git a/libc/arch-arm/bionic/kill.S b/libc/arch-arm/bionic/kill.S
index 723602a6b..0d24a3fb3 100644
--- a/libc/arch-arm/bionic/kill.S
+++ b/libc/arch-arm/bionic/kill.S
@@ -26,9 +26,7 @@
* SUCH DAMAGE.
*/
-#include <linux/err.h>
-#include <asm/unistd.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
/* unlike our auto-generated syscall stubs, this code saves lr
on the stack, as well as a few other registers. this makes
diff --git a/libc/arch-arm/bionic/syscall.S b/libc/arch-arm/bionic/syscall.S
index 510d2984f..a622b58b0 100644
--- a/libc/arch-arm/bionic/syscall.S
+++ b/libc/arch-arm/bionic/syscall.S
@@ -26,8 +26,7 @@
* SUCH DAMAGE.
*/
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(syscall)
mov ip, sp
diff --git a/libc/arch-arm/bionic/tgkill.S b/libc/arch-arm/bionic/tgkill.S
index 5f11b2096..4ef2abc02 100644
--- a/libc/arch-arm/bionic/tgkill.S
+++ b/libc/arch-arm/bionic/tgkill.S
@@ -26,9 +26,7 @@
* SUCH DAMAGE.
*/
-#include <linux/err.h>
-#include <asm/unistd.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
/* unlike our auto-generated syscall stubs, this code saves lr
on the stack, as well as a few other registers. this makes
diff --git a/libc/arch-arm/bionic/tkill.S b/libc/arch-arm/bionic/tkill.S
index fd6e21ef7..0a067d635 100644
--- a/libc/arch-arm/bionic/tkill.S
+++ b/libc/arch-arm/bionic/tkill.S
@@ -26,9 +26,7 @@
* SUCH DAMAGE.
*/
-#include <linux/err.h>
-#include <asm/unistd.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
/* unlike our auto-generated syscall stubs, this code saves lr
on the stack, as well as a few other registers. this makes
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
diff --git a/libc/arch-x86/syscalls/__brk.S b/libc/arch-x86/syscalls/__brk.S
index a275e3d6f..ebde7ba4d 100644
--- a/libc/arch-x86/syscalls/__brk.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__clone.S b/libc/arch-x86/syscalls/__clone.S
index c2e8ed8b0..2ff8fcd15 100644
--- a/libc/arch-x86/syscalls/__clone.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__epoll_pwait.S b/libc/arch-x86/syscalls/__epoll_pwait.S
index 9dc07f64e..2d424c693 100644
--- a/libc/arch-x86/syscalls/__epoll_pwait.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__exit.S b/libc/arch-x86/syscalls/__exit.S
index e906ea2d6..83f04a543 100644
--- a/libc/arch-x86/syscalls/__exit.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__fcntl64.S b/libc/arch-x86/syscalls/__fcntl64.S
index 96cac026a..dda2b1777 100644
--- a/libc/arch-x86/syscalls/__fcntl64.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__fstatfs64.S b/libc/arch-x86/syscalls/__fstatfs64.S
index ba6e0cf66..1f0cc8067 100644
--- a/libc/arch-x86/syscalls/__fstatfs64.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__getcpu.S b/libc/arch-x86/syscalls/__getcpu.S
index efb1b3e8f..cef5f1889 100644
--- a/libc/arch-x86/syscalls/__getcpu.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__getcwd.S b/libc/arch-x86/syscalls/__getcwd.S
index 88b9799d5..5a0dae2a8 100644
--- a/libc/arch-x86/syscalls/__getcwd.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__getpriority.S b/libc/arch-x86/syscalls/__getpriority.S
index 985613179..72fd8a539 100644
--- a/libc/arch-x86/syscalls/__getpriority.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__ioctl.S b/libc/arch-x86/syscalls/__ioctl.S
index 2a28a29cb..6caf918e1 100644
--- a/libc/arch-x86/syscalls/__ioctl.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__llseek.S b/libc/arch-x86/syscalls/__llseek.S
index 250753fde..a24b0216a 100644
--- a/libc/arch-x86/syscalls/__llseek.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__mmap2.S b/libc/arch-x86/syscalls/__mmap2.S
index a5b61236c..6308c9b9d 100644
--- a/libc/arch-x86/syscalls/__mmap2.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__openat.S b/libc/arch-x86/syscalls/__openat.S
index 06eaa763a..7bb833cf1 100644
--- a/libc/arch-x86/syscalls/__openat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__ppoll.S b/libc/arch-x86/syscalls/__ppoll.S
index 6445fb51e..553fad127 100644
--- a/libc/arch-x86/syscalls/__ppoll.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__pselect6.S b/libc/arch-x86/syscalls/__pselect6.S
index 8faa2dacb..a464c9a4d 100644
--- a/libc/arch-x86/syscalls/__pselect6.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__ptrace.S b/libc/arch-x86/syscalls/__ptrace.S
index 10b07d379..7dc46d9f4 100644
--- a/libc/arch-x86/syscalls/__ptrace.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__reboot.S b/libc/arch-x86/syscalls/__reboot.S
index 2bd0962e9..bde2c6078 100644
--- a/libc/arch-x86/syscalls/__reboot.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__rt_sigaction.S b/libc/arch-x86/syscalls/__rt_sigaction.S
index 1f151f298..47c33be9c 100644
--- a/libc/arch-x86/syscalls/__rt_sigaction.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__rt_sigpending.S b/libc/arch-x86/syscalls/__rt_sigpending.S
index 7652347c1..e4a098155 100644
--- a/libc/arch-x86/syscalls/__rt_sigpending.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__rt_sigprocmask.S b/libc/arch-x86/syscalls/__rt_sigprocmask.S
index 872ce6ecf..0fa110656 100644
--- a/libc/arch-x86/syscalls/__rt_sigprocmask.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__rt_sigsuspend.S b/libc/arch-x86/syscalls/__rt_sigsuspend.S
index f1ab0bbee..aa4eae6a3 100644
--- a/libc/arch-x86/syscalls/__rt_sigsuspend.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__rt_sigtimedwait.S b/libc/arch-x86/syscalls/__rt_sigtimedwait.S
index 6b028b97a..a97ef77b6 100644
--- a/libc/arch-x86/syscalls/__rt_sigtimedwait.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__sched_getaffinity.S b/libc/arch-x86/syscalls/__sched_getaffinity.S
index ee3a784fa..c9de99761 100644
--- a/libc/arch-x86/syscalls/__sched_getaffinity.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__set_thread_area.S b/libc/arch-x86/syscalls/__set_thread_area.S
index a11296305..0dc0e335d 100644
--- a/libc/arch-x86/syscalls/__set_thread_area.S
+++ b/libc/arch-x86/syscalls/__set_thread_area.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_thread_area)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__sigaction.S b/libc/arch-x86/syscalls/__sigaction.S
index d1356a671..45274df8b 100644
--- a/libc/arch-x86/syscalls/__sigaction.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__statfs64.S b/libc/arch-x86/syscalls/__statfs64.S
index cc018b98c..1db5f69b5 100644
--- a/libc/arch-x86/syscalls/__statfs64.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__syslog.S b/libc/arch-x86/syscalls/__syslog.S
index 390bef45d..dec69e8a8 100644
--- a/libc/arch-x86/syscalls/__syslog.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__timer_create.S b/libc/arch-x86/syscalls/__timer_create.S
index ba5275eee..6a30721e4 100644
--- a/libc/arch-x86/syscalls/__timer_create.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__timer_delete.S b/libc/arch-x86/syscalls/__timer_delete.S
index b9b45e185..5119cae77 100644
--- a/libc/arch-x86/syscalls/__timer_delete.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__timer_getoverrun.S b/libc/arch-x86/syscalls/__timer_getoverrun.S
index fd7d83f0f..fbe7e427f 100644
--- a/libc/arch-x86/syscalls/__timer_getoverrun.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__timer_gettime.S b/libc/arch-x86/syscalls/__timer_gettime.S
index 5b855442f..ec4a5e9d8 100644
--- a/libc/arch-x86/syscalls/__timer_gettime.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__timer_settime.S b/libc/arch-x86/syscalls/__timer_settime.S
index 6fad90799..abd2754ca 100644
--- a/libc/arch-x86/syscalls/__timer_settime.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/__waitid.S b/libc/arch-x86/syscalls/__waitid.S
index b42406f4a..c22a9c5e2 100644
--- a/libc/arch-x86/syscalls/__waitid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/_exit.S b/libc/arch-x86/syscalls/_exit.S
index 4e7352f32..04dc16b21 100644
--- a/libc/arch-x86/syscalls/_exit.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/accept.S b/libc/arch-x86/syscalls/accept.S
index 3dfa9b8fd..f2912c815 100644
--- a/libc/arch-x86/syscalls/accept.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/acct.S b/libc/arch-x86/syscalls/acct.S
index 3f831466c..02416bab6 100644
--- a/libc/arch-x86/syscalls/acct.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/bind.S b/libc/arch-x86/syscalls/bind.S
index a904e2054..0628ddbd4 100644
--- a/libc/arch-x86/syscalls/bind.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/capget.S b/libc/arch-x86/syscalls/capget.S
index d5b72d42e..1c55147c2 100644
--- a/libc/arch-x86/syscalls/capget.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/capset.S b/libc/arch-x86/syscalls/capset.S
index a9b2e8dda..485d2b0f0 100644
--- a/libc/arch-x86/syscalls/capset.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/chdir.S b/libc/arch-x86/syscalls/chdir.S
index 7d838e7ac..b944bf865 100644
--- a/libc/arch-x86/syscalls/chdir.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/chroot.S b/libc/arch-x86/syscalls/chroot.S
index 6fd017827..5ea29ae04 100644
--- a/libc/arch-x86/syscalls/chroot.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/clock_getres.S b/libc/arch-x86/syscalls/clock_getres.S
index bebdd2068..9af92785b 100644
--- a/libc/arch-x86/syscalls/clock_getres.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/clock_gettime.S b/libc/arch-x86/syscalls/clock_gettime.S
index d084cf2e3..0aff3328c 100644
--- a/libc/arch-x86/syscalls/clock_gettime.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/clock_nanosleep.S b/libc/arch-x86/syscalls/clock_nanosleep.S
index e86abf52b..572d4a050 100644
--- a/libc/arch-x86/syscalls/clock_nanosleep.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/clock_settime.S b/libc/arch-x86/syscalls/clock_settime.S
index aa21ccccd..8aaf9d857 100644
--- a/libc/arch-x86/syscalls/clock_settime.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/close.S b/libc/arch-x86/syscalls/close.S
index f82be45b1..2ceb2e1e8 100644
--- a/libc/arch-x86/syscalls/close.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/connect.S b/libc/arch-x86/syscalls/connect.S
index cc38fdd84..37336ee89 100644
--- a/libc/arch-x86/syscalls/connect.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/delete_module.S b/libc/arch-x86/syscalls/delete_module.S
index 326e62b43..197a23af8 100644
--- a/libc/arch-x86/syscalls/delete_module.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/dup.S b/libc/arch-x86/syscalls/dup.S
index f5da1de1e..5854471e5 100644
--- a/libc/arch-x86/syscalls/dup.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/dup3.S b/libc/arch-x86/syscalls/dup3.S
index 19522f04c..bb7c92fa5 100644
--- a/libc/arch-x86/syscalls/dup3.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/epoll_create1.S b/libc/arch-x86/syscalls/epoll_create1.S
index 53e807b88..e2e1e4171 100644
--- a/libc/arch-x86/syscalls/epoll_create1.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/epoll_ctl.S b/libc/arch-x86/syscalls/epoll_ctl.S
index c2258c081..c71119d76 100644
--- a/libc/arch-x86/syscalls/epoll_ctl.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/eventfd.S b/libc/arch-x86/syscalls/eventfd.S
index c458ac753..376a4f6ab 100644
--- a/libc/arch-x86/syscalls/eventfd.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/execve.S b/libc/arch-x86/syscalls/execve.S
index a88e9903f..8e6c432be 100644
--- a/libc/arch-x86/syscalls/execve.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/faccessat.S b/libc/arch-x86/syscalls/faccessat.S
index 809e1db75..be95a0e16 100644
--- a/libc/arch-x86/syscalls/faccessat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fchdir.S b/libc/arch-x86/syscalls/fchdir.S
index 5c5fc405d..a798322a2 100644
--- a/libc/arch-x86/syscalls/fchdir.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fchmod.S b/libc/arch-x86/syscalls/fchmod.S
index 5c436e8da..3dcf5dc75 100644
--- a/libc/arch-x86/syscalls/fchmod.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fchmodat.S b/libc/arch-x86/syscalls/fchmodat.S
index 524d58e82..254fcb814 100644
--- a/libc/arch-x86/syscalls/fchmodat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fchown.S b/libc/arch-x86/syscalls/fchown.S
index 60e9bda20..76298c483 100644
--- a/libc/arch-x86/syscalls/fchown.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fchownat.S b/libc/arch-x86/syscalls/fchownat.S
index 7a899baa7..fb295c48e 100644
--- a/libc/arch-x86/syscalls/fchownat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fdatasync.S b/libc/arch-x86/syscalls/fdatasync.S
index af14486d7..9ddf03b48 100644
--- a/libc/arch-x86/syscalls/fdatasync.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fgetxattr.S b/libc/arch-x86/syscalls/fgetxattr.S
index 5e279d5ae..2250c93f9 100644
--- a/libc/arch-x86/syscalls/fgetxattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/flistxattr.S b/libc/arch-x86/syscalls/flistxattr.S
index 4540fc5a5..1ebd9bd66 100644
--- a/libc/arch-x86/syscalls/flistxattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/flock.S b/libc/arch-x86/syscalls/flock.S
index 7d78ba652..c19edc7ce 100644
--- a/libc/arch-x86/syscalls/flock.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fremovexattr.S b/libc/arch-x86/syscalls/fremovexattr.S
index 1d2f44fb1..52b12886d 100644
--- a/libc/arch-x86/syscalls/fremovexattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fsetxattr.S b/libc/arch-x86/syscalls/fsetxattr.S
index d35197fed..f0e75e2a8 100644
--- a/libc/arch-x86/syscalls/fsetxattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fstat.S b/libc/arch-x86/syscalls/fstat.S
index 5384b929b..b37fc3fe0 100644
--- a/libc/arch-x86/syscalls/fstat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fstatat.S b/libc/arch-x86/syscalls/fstatat.S
index f907c5817..ec517c546 100644
--- a/libc/arch-x86/syscalls/fstatat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/fsync.S b/libc/arch-x86/syscalls/fsync.S
index d13e024e7..4f589f4d0 100644
--- a/libc/arch-x86/syscalls/fsync.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/ftruncate.S b/libc/arch-x86/syscalls/ftruncate.S
index 7d73f7011..e64ead40b 100644
--- a/libc/arch-x86/syscalls/ftruncate.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/ftruncate64.S b/libc/arch-x86/syscalls/ftruncate64.S
index 93a391a4e..9d34c4faf 100644
--- a/libc/arch-x86/syscalls/ftruncate64.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/futex.S b/libc/arch-x86/syscalls/futex.S
index 1648c90eb..732878560 100644
--- a/libc/arch-x86/syscalls/futex.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getdents.S b/libc/arch-x86/syscalls/getdents.S
index 47fec2328..1d681eedd 100644
--- a/libc/arch-x86/syscalls/getdents.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getegid.S b/libc/arch-x86/syscalls/getegid.S
index ceb6ed84c..61e783955 100644
--- a/libc/arch-x86/syscalls/getegid.S
+++ b/libc/arch-x86/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)
movl $__NR_getegid32, %eax
diff --git a/libc/arch-x86/syscalls/geteuid.S b/libc/arch-x86/syscalls/geteuid.S
index 0483b36c6..80bcf7ac5 100644
--- a/libc/arch-x86/syscalls/geteuid.S
+++ b/libc/arch-x86/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)
movl $__NR_geteuid32, %eax
diff --git a/libc/arch-x86/syscalls/getgid.S b/libc/arch-x86/syscalls/getgid.S
index 34b325823..87d31a73a 100644
--- a/libc/arch-x86/syscalls/getgid.S
+++ b/libc/arch-x86/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)
movl $__NR_getgid32, %eax
diff --git a/libc/arch-x86/syscalls/getgroups.S b/libc/arch-x86/syscalls/getgroups.S
index 98dfda0cf..7c563fd13 100644
--- a/libc/arch-x86/syscalls/getgroups.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getitimer.S b/libc/arch-x86/syscalls/getitimer.S
index 98f0ef53e..491cc8d81 100644
--- a/libc/arch-x86/syscalls/getitimer.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getpeername.S b/libc/arch-x86/syscalls/getpeername.S
index 04b1b62bc..432832092 100644
--- a/libc/arch-x86/syscalls/getpeername.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getpgid.S b/libc/arch-x86/syscalls/getpgid.S
index b9be37ba4..ff69cbc18 100644
--- a/libc/arch-x86/syscalls/getpgid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getpid.S b/libc/arch-x86/syscalls/getpid.S
index f6d57a529..cecaf74bb 100644
--- a/libc/arch-x86/syscalls/getpid.S
+++ b/libc/arch-x86/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)
movl $__NR_getpid, %eax
diff --git a/libc/arch-x86/syscalls/getppid.S b/libc/arch-x86/syscalls/getppid.S
index 619df2c86..b93204446 100644
--- a/libc/arch-x86/syscalls/getppid.S
+++ b/libc/arch-x86/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)
movl $__NR_getppid, %eax
diff --git a/libc/arch-x86/syscalls/getresgid.S b/libc/arch-x86/syscalls/getresgid.S
index 2e04aed4f..3bfa9b9fb 100644
--- a/libc/arch-x86/syscalls/getresgid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getresuid.S b/libc/arch-x86/syscalls/getresuid.S
index 4fa239901..c296ba8c8 100644
--- a/libc/arch-x86/syscalls/getresuid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getrlimit.S b/libc/arch-x86/syscalls/getrlimit.S
index d56cf392f..1bf19d0b8 100644
--- a/libc/arch-x86/syscalls/getrlimit.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getrusage.S b/libc/arch-x86/syscalls/getrusage.S
index 15e71b720..b86d48dd4 100644
--- a/libc/arch-x86/syscalls/getrusage.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getsid.S b/libc/arch-x86/syscalls/getsid.S
index 22fc7ed34..3e3997c0e 100644
--- a/libc/arch-x86/syscalls/getsid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getsockname.S b/libc/arch-x86/syscalls/getsockname.S
index fb1a48dc4..bd4fa1b4d 100644
--- a/libc/arch-x86/syscalls/getsockname.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getsockopt.S b/libc/arch-x86/syscalls/getsockopt.S
index b738c88dc..4f2c19a39 100644
--- a/libc/arch-x86/syscalls/getsockopt.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/gettid.S b/libc/arch-x86/syscalls/gettid.S
index e7b0fa7d3..1f264b138 100644
--- a/libc/arch-x86/syscalls/gettid.S
+++ b/libc/arch-x86/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)
movl $__NR_gettid, %eax
diff --git a/libc/arch-x86/syscalls/gettimeofday.S b/libc/arch-x86/syscalls/gettimeofday.S
index cc8a7b739..f711b16b6 100644
--- a/libc/arch-x86/syscalls/gettimeofday.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/getuid.S b/libc/arch-x86/syscalls/getuid.S
index 06bc8a033..e91305ab7 100644
--- a/libc/arch-x86/syscalls/getuid.S
+++ b/libc/arch-x86/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)
movl $__NR_getuid32, %eax
diff --git a/libc/arch-x86/syscalls/getxattr.S b/libc/arch-x86/syscalls/getxattr.S
index b7b22867c..93a1c415a 100644
--- a/libc/arch-x86/syscalls/getxattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/init_module.S b/libc/arch-x86/syscalls/init_module.S
index 755d7875f..4ed64f56b 100644
--- a/libc/arch-x86/syscalls/init_module.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/inotify_add_watch.S b/libc/arch-x86/syscalls/inotify_add_watch.S
index 1305f0721..9222e62f8 100644
--- a/libc/arch-x86/syscalls/inotify_add_watch.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/inotify_init1.S b/libc/arch-x86/syscalls/inotify_init1.S
index 5ea3b8e68..11496a56d 100644
--- a/libc/arch-x86/syscalls/inotify_init1.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/inotify_rm_watch.S b/libc/arch-x86/syscalls/inotify_rm_watch.S
index 4acee137c..83f5ccdc4 100644
--- a/libc/arch-x86/syscalls/inotify_rm_watch.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/ioprio_get.S b/libc/arch-x86/syscalls/ioprio_get.S
index b72451839..46bf8b529 100644
--- a/libc/arch-x86/syscalls/ioprio_get.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/ioprio_set.S b/libc/arch-x86/syscalls/ioprio_set.S
index 89b8f83ff..ba292eba0 100644
--- a/libc/arch-x86/syscalls/ioprio_set.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/kill.S b/libc/arch-x86/syscalls/kill.S
index 034467f78..250e991fa 100644
--- a/libc/arch-x86/syscalls/kill.S
+++ b/libc/arch-x86/syscalls/kill.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(kill)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/klogctl.S b/libc/arch-x86/syscalls/klogctl.S
index f84cb11de..22a4b3a6e 100644
--- a/libc/arch-x86/syscalls/klogctl.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/lgetxattr.S b/libc/arch-x86/syscalls/lgetxattr.S
index 590b0ebfd..1100a0152 100644
--- a/libc/arch-x86/syscalls/lgetxattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/linkat.S b/libc/arch-x86/syscalls/linkat.S
index 652f3469c..6aae8f5e0 100644
--- a/libc/arch-x86/syscalls/linkat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/listen.S b/libc/arch-x86/syscalls/listen.S
index fc0b50f27..7fe8a5a1e 100644
--- a/libc/arch-x86/syscalls/listen.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/listxattr.S b/libc/arch-x86/syscalls/listxattr.S
index ab00d5003..a1c3888e9 100644
--- a/libc/arch-x86/syscalls/listxattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/llistxattr.S b/libc/arch-x86/syscalls/llistxattr.S
index 6a1387cb7..66b25cda1 100644
--- a/libc/arch-x86/syscalls/llistxattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/lremovexattr.S b/libc/arch-x86/syscalls/lremovexattr.S
index 332057f5f..2d5009ff5 100644
--- a/libc/arch-x86/syscalls/lremovexattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/lseek.S b/libc/arch-x86/syscalls/lseek.S
index ad1031e09..1ed5310e2 100644
--- a/libc/arch-x86/syscalls/lseek.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/lsetxattr.S b/libc/arch-x86/syscalls/lsetxattr.S
index c475ec9e0..adaffcbb3 100644
--- a/libc/arch-x86/syscalls/lsetxattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/madvise.S b/libc/arch-x86/syscalls/madvise.S
index 0dbcd0c41..52d62a782 100644
--- a/libc/arch-x86/syscalls/madvise.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/mincore.S b/libc/arch-x86/syscalls/mincore.S
index 366d7480a..9e0bbefd8 100644
--- a/libc/arch-x86/syscalls/mincore.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/mkdirat.S b/libc/arch-x86/syscalls/mkdirat.S
index 484c0cb05..602208edf 100644
--- a/libc/arch-x86/syscalls/mkdirat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/mknodat.S b/libc/arch-x86/syscalls/mknodat.S
index 8e5394055..643d310f7 100644
--- a/libc/arch-x86/syscalls/mknodat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/mlock.S b/libc/arch-x86/syscalls/mlock.S
index 4e2c308e3..4a663ee66 100644
--- a/libc/arch-x86/syscalls/mlock.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/mlockall.S b/libc/arch-x86/syscalls/mlockall.S
index 752d032a8..ac3d6065d 100644
--- a/libc/arch-x86/syscalls/mlockall.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/mount.S b/libc/arch-x86/syscalls/mount.S
index c8d37398f..a7b4c1214 100644
--- a/libc/arch-x86/syscalls/mount.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/mprotect.S b/libc/arch-x86/syscalls/mprotect.S
index 02834bf2e..75340ba0f 100644
--- a/libc/arch-x86/syscalls/mprotect.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/mremap.S b/libc/arch-x86/syscalls/mremap.S
index f310c8bbf..3e77ebe0c 100644
--- a/libc/arch-x86/syscalls/mremap.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/msync.S b/libc/arch-x86/syscalls/msync.S
index 915d41618..8a7c68dec 100644
--- a/libc/arch-x86/syscalls/msync.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/munlock.S b/libc/arch-x86/syscalls/munlock.S
index 0202563be..868d00b28 100644
--- a/libc/arch-x86/syscalls/munlock.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/munlockall.S b/libc/arch-x86/syscalls/munlockall.S
index 1381366c5..238f812d7 100644
--- a/libc/arch-x86/syscalls/munlockall.S
+++ b/libc/arch-x86/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)
movl $__NR_munlockall, %eax
diff --git a/libc/arch-x86/syscalls/munmap.S b/libc/arch-x86/syscalls/munmap.S
index 5c171003a..b0b524de6 100644
--- a/libc/arch-x86/syscalls/munmap.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/nanosleep.S b/libc/arch-x86/syscalls/nanosleep.S
index fd8872efa..632baf504 100644
--- a/libc/arch-x86/syscalls/nanosleep.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/perf_event_open.S b/libc/arch-x86/syscalls/perf_event_open.S
index fec721f57..931282a2a 100644
--- a/libc/arch-x86/syscalls/perf_event_open.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/personality.S b/libc/arch-x86/syscalls/personality.S
index 3601d56e0..1d89a7cf1 100644
--- a/libc/arch-x86/syscalls/personality.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/pipe2.S b/libc/arch-x86/syscalls/pipe2.S
index 4af7750de..66c4bf198 100644
--- a/libc/arch-x86/syscalls/pipe2.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/prctl.S b/libc/arch-x86/syscalls/prctl.S
index 88cacc512..cd09df7b1 100644
--- a/libc/arch-x86/syscalls/prctl.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/pread64.S b/libc/arch-x86/syscalls/pread64.S
index ef8a934c4..0a6ae2d13 100644
--- a/libc/arch-x86/syscalls/pread64.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/pwrite64.S b/libc/arch-x86/syscalls/pwrite64.S
index 679ebbe15..7ad8ccf85 100644
--- a/libc/arch-x86/syscalls/pwrite64.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/read.S b/libc/arch-x86/syscalls/read.S
index 8d63762f7..a02435e6c 100644
--- a/libc/arch-x86/syscalls/read.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/readahead.S b/libc/arch-x86/syscalls/readahead.S
index 72d43f950..02d32ba42 100644
--- a/libc/arch-x86/syscalls/readahead.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/readlinkat.S b/libc/arch-x86/syscalls/readlinkat.S
index 73b05af29..8548deb6a 100644
--- a/libc/arch-x86/syscalls/readlinkat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/readv.S b/libc/arch-x86/syscalls/readv.S
index 77a2c7f7f..ebd9cafc4 100644
--- a/libc/arch-x86/syscalls/readv.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/recvfrom.S b/libc/arch-x86/syscalls/recvfrom.S
index 814ee12c7..c266e9305 100644
--- a/libc/arch-x86/syscalls/recvfrom.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/recvmsg.S b/libc/arch-x86/syscalls/recvmsg.S
index 66b861cd7..df290595b 100644
--- a/libc/arch-x86/syscalls/recvmsg.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/removexattr.S b/libc/arch-x86/syscalls/removexattr.S
index 20768f0d0..1a974be78 100644
--- a/libc/arch-x86/syscalls/removexattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/renameat.S b/libc/arch-x86/syscalls/renameat.S
index 83b75a7fd..8d2a0ede5 100644
--- a/libc/arch-x86/syscalls/renameat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sched_get_priority_max.S b/libc/arch-x86/syscalls/sched_get_priority_max.S
index 0291e6e14..089b576e6 100644
--- a/libc/arch-x86/syscalls/sched_get_priority_max.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sched_get_priority_min.S b/libc/arch-x86/syscalls/sched_get_priority_min.S
index 8598f9598..9e52f3002 100644
--- a/libc/arch-x86/syscalls/sched_get_priority_min.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sched_getparam.S b/libc/arch-x86/syscalls/sched_getparam.S
index 4bd091eed..2221ecafd 100644
--- a/libc/arch-x86/syscalls/sched_getparam.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sched_getscheduler.S b/libc/arch-x86/syscalls/sched_getscheduler.S
index 379d13f4d..167a5d5d2 100644
--- a/libc/arch-x86/syscalls/sched_getscheduler.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sched_rr_get_interval.S b/libc/arch-x86/syscalls/sched_rr_get_interval.S
index 8752884da..ee2ef0e89 100644
--- a/libc/arch-x86/syscalls/sched_rr_get_interval.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sched_setaffinity.S b/libc/arch-x86/syscalls/sched_setaffinity.S
index a687a515a..5ef78eeeb 100644
--- a/libc/arch-x86/syscalls/sched_setaffinity.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sched_setparam.S b/libc/arch-x86/syscalls/sched_setparam.S
index f3e1a292d..d993759f0 100644
--- a/libc/arch-x86/syscalls/sched_setparam.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sched_setscheduler.S b/libc/arch-x86/syscalls/sched_setscheduler.S
index f3925cee3..aa73874e7 100644
--- a/libc/arch-x86/syscalls/sched_setscheduler.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sched_yield.S b/libc/arch-x86/syscalls/sched_yield.S
index e17bc134d..41642f1d4 100644
--- a/libc/arch-x86/syscalls/sched_yield.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sendfile.S b/libc/arch-x86/syscalls/sendfile.S
index 8775132b1..9bebc9952 100644
--- a/libc/arch-x86/syscalls/sendfile.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sendfile64.S b/libc/arch-x86/syscalls/sendfile64.S
index 5688d8692..7032e8aae 100644
--- a/libc/arch-x86/syscalls/sendfile64.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sendmsg.S b/libc/arch-x86/syscalls/sendmsg.S
index 017b80595..410731f86 100644
--- a/libc/arch-x86/syscalls/sendmsg.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sendto.S b/libc/arch-x86/syscalls/sendto.S
index afa3598b6..c63bf08f6 100644
--- a/libc/arch-x86/syscalls/sendto.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setgid.S b/libc/arch-x86/syscalls/setgid.S
index 49ea046c1..a15eab105 100644
--- a/libc/arch-x86/syscalls/setgid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setgroups.S b/libc/arch-x86/syscalls/setgroups.S
index c1ab5507f..9c2879a2d 100644
--- a/libc/arch-x86/syscalls/setgroups.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setitimer.S b/libc/arch-x86/syscalls/setitimer.S
index 3d825142b..0a2328d1a 100644
--- a/libc/arch-x86/syscalls/setitimer.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setpgid.S b/libc/arch-x86/syscalls/setpgid.S
index 860d4e2bd..892323931 100644
--- a/libc/arch-x86/syscalls/setpgid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setpriority.S b/libc/arch-x86/syscalls/setpriority.S
index cbc5ac83e..6a887f608 100644
--- a/libc/arch-x86/syscalls/setpriority.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setregid.S b/libc/arch-x86/syscalls/setregid.S
index 439834e9a..8748c1021 100644
--- a/libc/arch-x86/syscalls/setregid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setresgid.S b/libc/arch-x86/syscalls/setresgid.S
index 2d257f74e..22eb02d11 100644
--- a/libc/arch-x86/syscalls/setresgid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setresuid.S b/libc/arch-x86/syscalls/setresuid.S
index 4718c7bb1..3a66ea674 100644
--- a/libc/arch-x86/syscalls/setresuid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setreuid.S b/libc/arch-x86/syscalls/setreuid.S
index 36f059dfd..16dd64e2a 100644
--- a/libc/arch-x86/syscalls/setreuid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setrlimit.S b/libc/arch-x86/syscalls/setrlimit.S
index 57d7ca8ab..cc69245db 100644
--- a/libc/arch-x86/syscalls/setrlimit.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setsid.S b/libc/arch-x86/syscalls/setsid.S
index 3672b4a63..382ad0c94 100644
--- a/libc/arch-x86/syscalls/setsid.S
+++ b/libc/arch-x86/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)
movl $__NR_setsid, %eax
diff --git a/libc/arch-x86/syscalls/setsockopt.S b/libc/arch-x86/syscalls/setsockopt.S
index aecf906a0..e927c2365 100644
--- a/libc/arch-x86/syscalls/setsockopt.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/settimeofday.S b/libc/arch-x86/syscalls/settimeofday.S
index a9a31023b..6c3b00b43 100644
--- a/libc/arch-x86/syscalls/settimeofday.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setuid.S b/libc/arch-x86/syscalls/setuid.S
index 510fc75dd..e7db8dadb 100644
--- a/libc/arch-x86/syscalls/setuid.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/setxattr.S b/libc/arch-x86/syscalls/setxattr.S
index ae9840a64..98cafb46c 100644
--- a/libc/arch-x86/syscalls/setxattr.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/shutdown.S b/libc/arch-x86/syscalls/shutdown.S
index d391ef5b0..d1ea58957 100644
--- a/libc/arch-x86/syscalls/shutdown.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sigaltstack.S b/libc/arch-x86/syscalls/sigaltstack.S
index 84e1e3ebd..58a299729 100644
--- a/libc/arch-x86/syscalls/sigaltstack.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/signalfd4.S b/libc/arch-x86/syscalls/signalfd4.S
index e3de47fa8..6e0c20bda 100644
--- a/libc/arch-x86/syscalls/signalfd4.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/socket.S b/libc/arch-x86/syscalls/socket.S
index c612cba60..1bc6bd752 100644
--- a/libc/arch-x86/syscalls/socket.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/socketpair.S b/libc/arch-x86/syscalls/socketpair.S
index 2fcff85b3..e2a98d34d 100644
--- a/libc/arch-x86/syscalls/socketpair.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/swapoff.S b/libc/arch-x86/syscalls/swapoff.S
index 38b145fff..1d0831996 100644
--- a/libc/arch-x86/syscalls/swapoff.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/swapon.S b/libc/arch-x86/syscalls/swapon.S
index 62310d4df..f6f47c65c 100644
--- a/libc/arch-x86/syscalls/swapon.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/symlinkat.S b/libc/arch-x86/syscalls/symlinkat.S
index 7d2422695..60115606f 100644
--- a/libc/arch-x86/syscalls/symlinkat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sync.S b/libc/arch-x86/syscalls/sync.S
index 6d8f3a729..518b39e24 100644
--- a/libc/arch-x86/syscalls/sync.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/sysinfo.S b/libc/arch-x86/syscalls/sysinfo.S
index e9c8059e3..8fde6e46d 100644
--- a/libc/arch-x86/syscalls/sysinfo.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/tgkill.S b/libc/arch-x86/syscalls/tgkill.S
index 96c5ec7a5..9bd0b6fba 100644
--- a/libc/arch-x86/syscalls/tgkill.S
+++ b/libc/arch-x86/syscalls/tgkill.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(tgkill)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/timerfd_create.S b/libc/arch-x86/syscalls/timerfd_create.S
index 178092ca7..8546c34b9 100644
--- a/libc/arch-x86/syscalls/timerfd_create.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/timerfd_gettime.S b/libc/arch-x86/syscalls/timerfd_gettime.S
index 7fa69895e..5f3908049 100644
--- a/libc/arch-x86/syscalls/timerfd_gettime.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/timerfd_settime.S b/libc/arch-x86/syscalls/timerfd_settime.S
index 705cfc8d9..c017ca831 100644
--- a/libc/arch-x86/syscalls/timerfd_settime.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/times.S b/libc/arch-x86/syscalls/times.S
index 8000355f1..7ada37666 100644
--- a/libc/arch-x86/syscalls/times.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/tkill.S b/libc/arch-x86/syscalls/tkill.S
index 4a2b0674e..326efa3c2 100644
--- a/libc/arch-x86/syscalls/tkill.S
+++ b/libc/arch-x86/syscalls/tkill.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(tkill)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/truncate.S b/libc/arch-x86/syscalls/truncate.S
index b210ca74c..06256217e 100644
--- a/libc/arch-x86/syscalls/truncate.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/truncate64.S b/libc/arch-x86/syscalls/truncate64.S
index f532f416f..0a45f8a28 100644
--- a/libc/arch-x86/syscalls/truncate64.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/umask.S b/libc/arch-x86/syscalls/umask.S
index a642c51fe..3534340c5 100644
--- a/libc/arch-x86/syscalls/umask.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/umount2.S b/libc/arch-x86/syscalls/umount2.S
index 0a1682f01..f5f9c66c0 100644
--- a/libc/arch-x86/syscalls/umount2.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/uname.S b/libc/arch-x86/syscalls/uname.S
index daed92a14..62035678d 100644
--- a/libc/arch-x86/syscalls/uname.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/unlinkat.S b/libc/arch-x86/syscalls/unlinkat.S
index e86045eb3..8527c0b9d 100644
--- a/libc/arch-x86/syscalls/unlinkat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/unshare.S b/libc/arch-x86/syscalls/unshare.S
index 49631e609..00214bd3d 100644
--- a/libc/arch-x86/syscalls/unshare.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/utimensat.S b/libc/arch-x86/syscalls/utimensat.S
index 5e6c14435..7869ebcce 100644
--- a/libc/arch-x86/syscalls/utimensat.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/wait4.S b/libc/arch-x86/syscalls/wait4.S
index e61aaa58a..c887b6cde 100644
--- a/libc/arch-x86/syscalls/wait4.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/write.S b/libc/arch-x86/syscalls/write.S
index dc165e67a..60989affd 100644
--- a/libc/arch-x86/syscalls/write.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86/syscalls/writev.S b/libc/arch-x86/syscalls/writev.S
index 45b0846df..f7e8a9336 100644
--- a/libc/arch-x86/syscalls/writev.S
+++ b/libc/arch-x86/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)
pushl %ebx
diff --git a/libc/arch-x86_64/bionic/syscall.S b/libc/arch-x86_64/bionic/syscall.S
index 6b84ba4f3..a98a436f0 100644
--- a/libc/arch-x86_64/bionic/syscall.S
+++ b/libc/arch-x86_64/bionic/syscall.S
@@ -38,9 +38,7 @@
* %r9: arg5
*/
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(syscall)
# All arguments are passed via registers.
@@ -63,3 +61,4 @@ ENTRY(syscall)
orq $-1, %rax
1:
ret
+END(syscall)
diff --git a/libc/arch-x86_64/bionic/vfork.S b/libc/arch-x86_64/bionic/vfork.S
index ad73cf68a..b323f3068 100644
--- a/libc/arch-x86_64/bionic/vfork.S
+++ b/libc/arch-x86_64/bionic/vfork.S
@@ -26,9 +26,7 @@
* SUCH DAMAGE.
*/
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
// This custom code preserves the return address across the system call.
diff --git a/libc/arch-x86_64/syscalls/__arch_prctl.S b/libc/arch-x86_64/syscalls/__arch_prctl.S
index 0adcfd252..e8786795d 100644
--- a/libc/arch-x86_64/syscalls/__arch_prctl.S
+++ b/libc/arch-x86_64/syscalls/__arch_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(__arch_prctl)
movl $__NR_arch_prctl, %eax
diff --git a/libc/arch-x86_64/syscalls/__brk.S b/libc/arch-x86_64/syscalls/__brk.S
index 6227f9d85..18c29970c 100644
--- a/libc/arch-x86_64/syscalls/__brk.S
+++ b/libc/arch-x86_64/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)
movl $__NR_brk, %eax
diff --git a/libc/arch-x86_64/syscalls/__clone.S b/libc/arch-x86_64/syscalls/__clone.S
index 9de9a681c..4999762bf 100644
--- a/libc/arch-x86_64/syscalls/__clone.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__epoll_pwait.S b/libc/arch-x86_64/syscalls/__epoll_pwait.S
index 5be1f2a69..ed913b02a 100644
--- a/libc/arch-x86_64/syscalls/__epoll_pwait.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__exit.S b/libc/arch-x86_64/syscalls/__exit.S
index 7e3424576..da1f9f8b3 100644
--- a/libc/arch-x86_64/syscalls/__exit.S
+++ b/libc/arch-x86_64/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)
movl $__NR_exit, %eax
diff --git a/libc/arch-x86_64/syscalls/__getcpu.S b/libc/arch-x86_64/syscalls/__getcpu.S
index c669ea69f..5a184940a 100644
--- a/libc/arch-x86_64/syscalls/__getcpu.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getcpu, %eax
diff --git a/libc/arch-x86_64/syscalls/__getcwd.S b/libc/arch-x86_64/syscalls/__getcwd.S
index dd34d1963..c9e99422f 100644
--- a/libc/arch-x86_64/syscalls/__getcwd.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getcwd, %eax
diff --git a/libc/arch-x86_64/syscalls/__getpriority.S b/libc/arch-x86_64/syscalls/__getpriority.S
index 588f7fe2f..f5230e16b 100644
--- a/libc/arch-x86_64/syscalls/__getpriority.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getpriority, %eax
diff --git a/libc/arch-x86_64/syscalls/__ioctl.S b/libc/arch-x86_64/syscalls/__ioctl.S
index 264ffa44f..8f30eb6a9 100644
--- a/libc/arch-x86_64/syscalls/__ioctl.S
+++ b/libc/arch-x86_64/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)
movl $__NR_ioctl, %eax
diff --git a/libc/arch-x86_64/syscalls/__openat.S b/libc/arch-x86_64/syscalls/__openat.S
index 36f7ddc1d..cd6a07fe6 100644
--- a/libc/arch-x86_64/syscalls/__openat.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__ppoll.S b/libc/arch-x86_64/syscalls/__ppoll.S
index a92dfe502..dd639ae6a 100644
--- a/libc/arch-x86_64/syscalls/__ppoll.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__pselect6.S b/libc/arch-x86_64/syscalls/__pselect6.S
index 44d5c8d2b..c37483a79 100644
--- a/libc/arch-x86_64/syscalls/__pselect6.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__ptrace.S b/libc/arch-x86_64/syscalls/__ptrace.S
index f032f3e73..be42b91a6 100644
--- a/libc/arch-x86_64/syscalls/__ptrace.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__reboot.S b/libc/arch-x86_64/syscalls/__reboot.S
index d62ebcdb2..fc8e58d3e 100644
--- a/libc/arch-x86_64/syscalls/__reboot.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__rt_sigaction.S b/libc/arch-x86_64/syscalls/__rt_sigaction.S
index e2892bf0a..70602dfe8 100644
--- a/libc/arch-x86_64/syscalls/__rt_sigaction.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__rt_sigpending.S b/libc/arch-x86_64/syscalls/__rt_sigpending.S
index d683b37ce..1caf13161 100644
--- a/libc/arch-x86_64/syscalls/__rt_sigpending.S
+++ b/libc/arch-x86_64/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)
movl $__NR_rt_sigpending, %eax
diff --git a/libc/arch-x86_64/syscalls/__rt_sigprocmask.S b/libc/arch-x86_64/syscalls/__rt_sigprocmask.S
index 236b68de2..d7e44a7fa 100644
--- a/libc/arch-x86_64/syscalls/__rt_sigprocmask.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__rt_sigsuspend.S b/libc/arch-x86_64/syscalls/__rt_sigsuspend.S
index ed45250da..851b93e52 100644
--- a/libc/arch-x86_64/syscalls/__rt_sigsuspend.S
+++ b/libc/arch-x86_64/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)
movl $__NR_rt_sigsuspend, %eax
diff --git a/libc/arch-x86_64/syscalls/__rt_sigtimedwait.S b/libc/arch-x86_64/syscalls/__rt_sigtimedwait.S
index bc2fdef9d..6962d4a31 100644
--- a/libc/arch-x86_64/syscalls/__rt_sigtimedwait.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__sched_getaffinity.S b/libc/arch-x86_64/syscalls/__sched_getaffinity.S
index 14765574d..861f06bac 100644
--- a/libc/arch-x86_64/syscalls/__sched_getaffinity.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sched_getaffinity, %eax
diff --git a/libc/arch-x86_64/syscalls/__syslog.S b/libc/arch-x86_64/syscalls/__syslog.S
index db3a3976e..4e41149ab 100644
--- a/libc/arch-x86_64/syscalls/__syslog.S
+++ b/libc/arch-x86_64/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)
movl $__NR_syslog, %eax
diff --git a/libc/arch-x86_64/syscalls/__timer_create.S b/libc/arch-x86_64/syscalls/__timer_create.S
index c4c4a2e13..1c5c68e8f 100644
--- a/libc/arch-x86_64/syscalls/__timer_create.S
+++ b/libc/arch-x86_64/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)
movl $__NR_timer_create, %eax
diff --git a/libc/arch-x86_64/syscalls/__timer_delete.S b/libc/arch-x86_64/syscalls/__timer_delete.S
index 808884116..c8267578c 100644
--- a/libc/arch-x86_64/syscalls/__timer_delete.S
+++ b/libc/arch-x86_64/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)
movl $__NR_timer_delete, %eax
diff --git a/libc/arch-x86_64/syscalls/__timer_getoverrun.S b/libc/arch-x86_64/syscalls/__timer_getoverrun.S
index f5224b48e..772b05ef2 100644
--- a/libc/arch-x86_64/syscalls/__timer_getoverrun.S
+++ b/libc/arch-x86_64/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)
movl $__NR_timer_getoverrun, %eax
diff --git a/libc/arch-x86_64/syscalls/__timer_gettime.S b/libc/arch-x86_64/syscalls/__timer_gettime.S
index bf3efff13..181069ba0 100644
--- a/libc/arch-x86_64/syscalls/__timer_gettime.S
+++ b/libc/arch-x86_64/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)
movl $__NR_timer_gettime, %eax
diff --git a/libc/arch-x86_64/syscalls/__timer_settime.S b/libc/arch-x86_64/syscalls/__timer_settime.S
index 694216e28..11fe04e43 100644
--- a/libc/arch-x86_64/syscalls/__timer_settime.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/__waitid.S b/libc/arch-x86_64/syscalls/__waitid.S
index 5632fb1ce..4317d785a 100644
--- a/libc/arch-x86_64/syscalls/__waitid.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/_exit.S b/libc/arch-x86_64/syscalls/_exit.S
index 4f21ac18a..f40cfe3f1 100644
--- a/libc/arch-x86_64/syscalls/_exit.S
+++ b/libc/arch-x86_64/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)
movl $__NR_exit_group, %eax
diff --git a/libc/arch-x86_64/syscalls/accept.S b/libc/arch-x86_64/syscalls/accept.S
index 5402526f9..588fb8231 100644
--- a/libc/arch-x86_64/syscalls/accept.S
+++ b/libc/arch-x86_64/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)
movl $__NR_accept, %eax
diff --git a/libc/arch-x86_64/syscalls/acct.S b/libc/arch-x86_64/syscalls/acct.S
index 75352dcd5..59af17d3b 100644
--- a/libc/arch-x86_64/syscalls/acct.S
+++ b/libc/arch-x86_64/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)
movl $__NR_acct, %eax
diff --git a/libc/arch-x86_64/syscalls/bind.S b/libc/arch-x86_64/syscalls/bind.S
index a9449f36b..20dfa2de8 100644
--- a/libc/arch-x86_64/syscalls/bind.S
+++ b/libc/arch-x86_64/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)
movl $__NR_bind, %eax
diff --git a/libc/arch-x86_64/syscalls/capget.S b/libc/arch-x86_64/syscalls/capget.S
index 522ace893..9cf73fb17 100644
--- a/libc/arch-x86_64/syscalls/capget.S
+++ b/libc/arch-x86_64/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)
movl $__NR_capget, %eax
diff --git a/libc/arch-x86_64/syscalls/capset.S b/libc/arch-x86_64/syscalls/capset.S
index 7eb2d90de..f6cf2ebf5 100644
--- a/libc/arch-x86_64/syscalls/capset.S
+++ b/libc/arch-x86_64/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)
movl $__NR_capset, %eax
diff --git a/libc/arch-x86_64/syscalls/chdir.S b/libc/arch-x86_64/syscalls/chdir.S
index b8061577e..a04f3aadb 100644
--- a/libc/arch-x86_64/syscalls/chdir.S
+++ b/libc/arch-x86_64/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)
movl $__NR_chdir, %eax
diff --git a/libc/arch-x86_64/syscalls/chroot.S b/libc/arch-x86_64/syscalls/chroot.S
index 67d396a3d..491086d43 100644
--- a/libc/arch-x86_64/syscalls/chroot.S
+++ b/libc/arch-x86_64/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)
movl $__NR_chroot, %eax
diff --git a/libc/arch-x86_64/syscalls/clock_getres.S b/libc/arch-x86_64/syscalls/clock_getres.S
index 0aeba20e8..d1d491e38 100644
--- a/libc/arch-x86_64/syscalls/clock_getres.S
+++ b/libc/arch-x86_64/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)
movl $__NR_clock_getres, %eax
diff --git a/libc/arch-x86_64/syscalls/clock_gettime.S b/libc/arch-x86_64/syscalls/clock_gettime.S
index 9820f0153..89ae61672 100644
--- a/libc/arch-x86_64/syscalls/clock_gettime.S
+++ b/libc/arch-x86_64/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)
movl $__NR_clock_gettime, %eax
diff --git a/libc/arch-x86_64/syscalls/clock_nanosleep.S b/libc/arch-x86_64/syscalls/clock_nanosleep.S
index 566afe44d..38331139e 100644
--- a/libc/arch-x86_64/syscalls/clock_nanosleep.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/clock_settime.S b/libc/arch-x86_64/syscalls/clock_settime.S
index 2eef8eafe..15b27aaa2 100644
--- a/libc/arch-x86_64/syscalls/clock_settime.S
+++ b/libc/arch-x86_64/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)
movl $__NR_clock_settime, %eax
diff --git a/libc/arch-x86_64/syscalls/close.S b/libc/arch-x86_64/syscalls/close.S
index 30387152f..361d82faa 100644
--- a/libc/arch-x86_64/syscalls/close.S
+++ b/libc/arch-x86_64/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)
movl $__NR_close, %eax
diff --git a/libc/arch-x86_64/syscalls/connect.S b/libc/arch-x86_64/syscalls/connect.S
index 3381b3269..23cdbae99 100644
--- a/libc/arch-x86_64/syscalls/connect.S
+++ b/libc/arch-x86_64/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)
movl $__NR_connect, %eax
diff --git a/libc/arch-x86_64/syscalls/delete_module.S b/libc/arch-x86_64/syscalls/delete_module.S
index 8857c8f14..33f235459 100644
--- a/libc/arch-x86_64/syscalls/delete_module.S
+++ b/libc/arch-x86_64/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)
movl $__NR_delete_module, %eax
diff --git a/libc/arch-x86_64/syscalls/dup.S b/libc/arch-x86_64/syscalls/dup.S
index 2754c5e1d..dfc0def2c 100644
--- a/libc/arch-x86_64/syscalls/dup.S
+++ b/libc/arch-x86_64/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)
movl $__NR_dup, %eax
diff --git a/libc/arch-x86_64/syscalls/dup3.S b/libc/arch-x86_64/syscalls/dup3.S
index 58783903f..dcb4155b8 100644
--- a/libc/arch-x86_64/syscalls/dup3.S
+++ b/libc/arch-x86_64/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)
movl $__NR_dup3, %eax
diff --git a/libc/arch-x86_64/syscalls/epoll_create1.S b/libc/arch-x86_64/syscalls/epoll_create1.S
index 7de84961b..fa3c6d793 100644
--- a/libc/arch-x86_64/syscalls/epoll_create1.S
+++ b/libc/arch-x86_64/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)
movl $__NR_epoll_create1, %eax
diff --git a/libc/arch-x86_64/syscalls/epoll_ctl.S b/libc/arch-x86_64/syscalls/epoll_ctl.S
index 637efe4c7..72df97ff8 100644
--- a/libc/arch-x86_64/syscalls/epoll_ctl.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/eventfd.S b/libc/arch-x86_64/syscalls/eventfd.S
index 50f372cca..99f585c8d 100644
--- a/libc/arch-x86_64/syscalls/eventfd.S
+++ b/libc/arch-x86_64/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)
movl $__NR_eventfd2, %eax
diff --git a/libc/arch-x86_64/syscalls/execve.S b/libc/arch-x86_64/syscalls/execve.S
index ff5602fb2..ea89d7db5 100644
--- a/libc/arch-x86_64/syscalls/execve.S
+++ b/libc/arch-x86_64/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)
movl $__NR_execve, %eax
diff --git a/libc/arch-x86_64/syscalls/faccessat.S b/libc/arch-x86_64/syscalls/faccessat.S
index 43dae9351..238a4e1a0 100644
--- a/libc/arch-x86_64/syscalls/faccessat.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/fchdir.S b/libc/arch-x86_64/syscalls/fchdir.S
index 0e3b161a2..da14edd67 100644
--- a/libc/arch-x86_64/syscalls/fchdir.S
+++ b/libc/arch-x86_64/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)
movl $__NR_fchdir, %eax
diff --git a/libc/arch-x86_64/syscalls/fchmod.S b/libc/arch-x86_64/syscalls/fchmod.S
index f7a299601..a6d15fc6d 100644
--- a/libc/arch-x86_64/syscalls/fchmod.S
+++ b/libc/arch-x86_64/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)
movl $__NR_fchmod, %eax
diff --git a/libc/arch-x86_64/syscalls/fchmodat.S b/libc/arch-x86_64/syscalls/fchmodat.S
index 68c0054eb..daf71ab83 100644
--- a/libc/arch-x86_64/syscalls/fchmodat.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/fchown.S b/libc/arch-x86_64/syscalls/fchown.S
index b879ff6a2..8c68a15ff 100644
--- a/libc/arch-x86_64/syscalls/fchown.S
+++ b/libc/arch-x86_64/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)
movl $__NR_fchown, %eax
diff --git a/libc/arch-x86_64/syscalls/fchownat.S b/libc/arch-x86_64/syscalls/fchownat.S
index 76279fcdd..e5265dd07 100644
--- a/libc/arch-x86_64/syscalls/fchownat.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/fcntl.S b/libc/arch-x86_64/syscalls/fcntl.S
index c8ed57e0a..c56238508 100644
--- a/libc/arch-x86_64/syscalls/fcntl.S
+++ b/libc/arch-x86_64/syscalls/fcntl.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(fcntl)
movl $__NR_fcntl, %eax
diff --git a/libc/arch-x86_64/syscalls/fdatasync.S b/libc/arch-x86_64/syscalls/fdatasync.S
index c3bdbe2d1..3f9ee7282 100644
--- a/libc/arch-x86_64/syscalls/fdatasync.S
+++ b/libc/arch-x86_64/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)
movl $__NR_fdatasync, %eax
diff --git a/libc/arch-x86_64/syscalls/fgetxattr.S b/libc/arch-x86_64/syscalls/fgetxattr.S
index 901d07a99..77f095ba2 100644
--- a/libc/arch-x86_64/syscalls/fgetxattr.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/flistxattr.S b/libc/arch-x86_64/syscalls/flistxattr.S
index 88e506ae9..cd392988e 100644
--- a/libc/arch-x86_64/syscalls/flistxattr.S
+++ b/libc/arch-x86_64/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)
movl $__NR_flistxattr, %eax
diff --git a/libc/arch-x86_64/syscalls/flock.S b/libc/arch-x86_64/syscalls/flock.S
index 02353ac95..af2dbef2c 100644
--- a/libc/arch-x86_64/syscalls/flock.S
+++ b/libc/arch-x86_64/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)
movl $__NR_flock, %eax
diff --git a/libc/arch-x86_64/syscalls/fremovexattr.S b/libc/arch-x86_64/syscalls/fremovexattr.S
index 3c685b13c..438756345 100644
--- a/libc/arch-x86_64/syscalls/fremovexattr.S
+++ b/libc/arch-x86_64/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)
movl $__NR_fremovexattr, %eax
diff --git a/libc/arch-x86_64/syscalls/fsetxattr.S b/libc/arch-x86_64/syscalls/fsetxattr.S
index 1a70a46fb..610890c8d 100644
--- a/libc/arch-x86_64/syscalls/fsetxattr.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/fstat.S b/libc/arch-x86_64/syscalls/fstat.S
index afd4931e2..35f487df8 100644
--- a/libc/arch-x86_64/syscalls/fstat.S
+++ b/libc/arch-x86_64/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)
movl $__NR_fstat, %eax
diff --git a/libc/arch-x86_64/syscalls/fstatat.S b/libc/arch-x86_64/syscalls/fstatat.S
index 577660f06..c5d79bd7f 100644
--- a/libc/arch-x86_64/syscalls/fstatat.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/fstatfs.S b/libc/arch-x86_64/syscalls/fstatfs.S
index 5e4a4a425..59a90fb48 100644
--- a/libc/arch-x86_64/syscalls/fstatfs.S
+++ b/libc/arch-x86_64/syscalls/fstatfs.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(fstatfs)
movl $__NR_fstatfs, %eax
diff --git a/libc/arch-x86_64/syscalls/fsync.S b/libc/arch-x86_64/syscalls/fsync.S
index 5c5774e3f..0392620de 100644
--- a/libc/arch-x86_64/syscalls/fsync.S
+++ b/libc/arch-x86_64/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)
movl $__NR_fsync, %eax
diff --git a/libc/arch-x86_64/syscalls/ftruncate.S b/libc/arch-x86_64/syscalls/ftruncate.S
index 5157fec5a..80cbe79ba 100644
--- a/libc/arch-x86_64/syscalls/ftruncate.S
+++ b/libc/arch-x86_64/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)
movl $__NR_ftruncate, %eax
diff --git a/libc/arch-x86_64/syscalls/futex.S b/libc/arch-x86_64/syscalls/futex.S
index 9dfcf9090..62f64bd9f 100644
--- a/libc/arch-x86_64/syscalls/futex.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/getdents.S b/libc/arch-x86_64/syscalls/getdents.S
index d031d8a57..a47c26bdd 100644
--- a/libc/arch-x86_64/syscalls/getdents.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getdents64, %eax
diff --git a/libc/arch-x86_64/syscalls/getegid.S b/libc/arch-x86_64/syscalls/getegid.S
index c190a12f0..c1b8fae01 100644
--- a/libc/arch-x86_64/syscalls/getegid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getegid, %eax
diff --git a/libc/arch-x86_64/syscalls/geteuid.S b/libc/arch-x86_64/syscalls/geteuid.S
index c0d1026f6..f2f103546 100644
--- a/libc/arch-x86_64/syscalls/geteuid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_geteuid, %eax
diff --git a/libc/arch-x86_64/syscalls/getgid.S b/libc/arch-x86_64/syscalls/getgid.S
index b259f9d22..e9b38c7a2 100644
--- a/libc/arch-x86_64/syscalls/getgid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getgid, %eax
diff --git a/libc/arch-x86_64/syscalls/getgroups.S b/libc/arch-x86_64/syscalls/getgroups.S
index 3615be177..b12836e6d 100644
--- a/libc/arch-x86_64/syscalls/getgroups.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getgroups, %eax
diff --git a/libc/arch-x86_64/syscalls/getitimer.S b/libc/arch-x86_64/syscalls/getitimer.S
index 1da4cf4c6..79484d11b 100644
--- a/libc/arch-x86_64/syscalls/getitimer.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getitimer, %eax
diff --git a/libc/arch-x86_64/syscalls/getpeername.S b/libc/arch-x86_64/syscalls/getpeername.S
index a8b8de984..a276cac4f 100644
--- a/libc/arch-x86_64/syscalls/getpeername.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getpeername, %eax
diff --git a/libc/arch-x86_64/syscalls/getpgid.S b/libc/arch-x86_64/syscalls/getpgid.S
index d28e4e3c7..c2f5c092c 100644
--- a/libc/arch-x86_64/syscalls/getpgid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getpgid, %eax
diff --git a/libc/arch-x86_64/syscalls/getpid.S b/libc/arch-x86_64/syscalls/getpid.S
index df3e33140..65b8df4b8 100644
--- a/libc/arch-x86_64/syscalls/getpid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getpid, %eax
diff --git a/libc/arch-x86_64/syscalls/getppid.S b/libc/arch-x86_64/syscalls/getppid.S
index 6ddf4f0bd..ce3dbda16 100644
--- a/libc/arch-x86_64/syscalls/getppid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getppid, %eax
diff --git a/libc/arch-x86_64/syscalls/getresgid.S b/libc/arch-x86_64/syscalls/getresgid.S
index f84960d4d..0edc20ad5 100644
--- a/libc/arch-x86_64/syscalls/getresgid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getresgid, %eax
diff --git a/libc/arch-x86_64/syscalls/getresuid.S b/libc/arch-x86_64/syscalls/getresuid.S
index c68515271..b900c9944 100644
--- a/libc/arch-x86_64/syscalls/getresuid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getresuid, %eax
diff --git a/libc/arch-x86_64/syscalls/getrlimit.S b/libc/arch-x86_64/syscalls/getrlimit.S
index f0e9c4723..1417b28df 100644
--- a/libc/arch-x86_64/syscalls/getrlimit.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getrlimit, %eax
diff --git a/libc/arch-x86_64/syscalls/getrusage.S b/libc/arch-x86_64/syscalls/getrusage.S
index 2e8de0adb..210d58647 100644
--- a/libc/arch-x86_64/syscalls/getrusage.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getrusage, %eax
diff --git a/libc/arch-x86_64/syscalls/getsid.S b/libc/arch-x86_64/syscalls/getsid.S
index 2c819ca82..de3e3c0e9 100644
--- a/libc/arch-x86_64/syscalls/getsid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getsid, %eax
diff --git a/libc/arch-x86_64/syscalls/getsockname.S b/libc/arch-x86_64/syscalls/getsockname.S
index bcac55f71..ccabf71fc 100644
--- a/libc/arch-x86_64/syscalls/getsockname.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getsockname, %eax
diff --git a/libc/arch-x86_64/syscalls/getsockopt.S b/libc/arch-x86_64/syscalls/getsockopt.S
index 6fb3741bc..c4f456eb8 100644
--- a/libc/arch-x86_64/syscalls/getsockopt.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/gettid.S b/libc/arch-x86_64/syscalls/gettid.S
index 802ee76bd..65ecc16bc 100644
--- a/libc/arch-x86_64/syscalls/gettid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_gettid, %eax
diff --git a/libc/arch-x86_64/syscalls/gettimeofday.S b/libc/arch-x86_64/syscalls/gettimeofday.S
index 3b006d7e0..261bb6e67 100644
--- a/libc/arch-x86_64/syscalls/gettimeofday.S
+++ b/libc/arch-x86_64/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)
movl $__NR_gettimeofday, %eax
diff --git a/libc/arch-x86_64/syscalls/getuid.S b/libc/arch-x86_64/syscalls/getuid.S
index 9a93c9903..4cb9efd1f 100644
--- a/libc/arch-x86_64/syscalls/getuid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_getuid, %eax
diff --git a/libc/arch-x86_64/syscalls/getxattr.S b/libc/arch-x86_64/syscalls/getxattr.S
index c3400a2d9..6bdb762c0 100644
--- a/libc/arch-x86_64/syscalls/getxattr.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/init_module.S b/libc/arch-x86_64/syscalls/init_module.S
index 93a0ee2ec..eb048c032 100644
--- a/libc/arch-x86_64/syscalls/init_module.S
+++ b/libc/arch-x86_64/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)
movl $__NR_init_module, %eax
diff --git a/libc/arch-x86_64/syscalls/inotify_add_watch.S b/libc/arch-x86_64/syscalls/inotify_add_watch.S
index 7e0f0aff3..3e124e719 100644
--- a/libc/arch-x86_64/syscalls/inotify_add_watch.S
+++ b/libc/arch-x86_64/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)
movl $__NR_inotify_add_watch, %eax
diff --git a/libc/arch-x86_64/syscalls/inotify_init1.S b/libc/arch-x86_64/syscalls/inotify_init1.S
index 86a6d5f10..8d821152c 100644
--- a/libc/arch-x86_64/syscalls/inotify_init1.S
+++ b/libc/arch-x86_64/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)
movl $__NR_inotify_init1, %eax
diff --git a/libc/arch-x86_64/syscalls/inotify_rm_watch.S b/libc/arch-x86_64/syscalls/inotify_rm_watch.S
index 25ab8914d..ece151049 100644
--- a/libc/arch-x86_64/syscalls/inotify_rm_watch.S
+++ b/libc/arch-x86_64/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)
movl $__NR_inotify_rm_watch, %eax
diff --git a/libc/arch-x86_64/syscalls/ioprio_get.S b/libc/arch-x86_64/syscalls/ioprio_get.S
index 3212ae180..48c140218 100644
--- a/libc/arch-x86_64/syscalls/ioprio_get.S
+++ b/libc/arch-x86_64/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)
movl $__NR_ioprio_get, %eax
diff --git a/libc/arch-x86_64/syscalls/ioprio_set.S b/libc/arch-x86_64/syscalls/ioprio_set.S
index 924bdefbe..4cdc8b394 100644
--- a/libc/arch-x86_64/syscalls/ioprio_set.S
+++ b/libc/arch-x86_64/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)
movl $__NR_ioprio_set, %eax
diff --git a/libc/arch-x86_64/syscalls/kill.S b/libc/arch-x86_64/syscalls/kill.S
index 813cd0ea1..51ca35cb0 100644
--- a/libc/arch-x86_64/syscalls/kill.S
+++ b/libc/arch-x86_64/syscalls/kill.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(kill)
movl $__NR_kill, %eax
diff --git a/libc/arch-x86_64/syscalls/klogctl.S b/libc/arch-x86_64/syscalls/klogctl.S
index 629ef1931..8c0cccee8 100644
--- a/libc/arch-x86_64/syscalls/klogctl.S
+++ b/libc/arch-x86_64/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)
movl $__NR_syslog, %eax
diff --git a/libc/arch-x86_64/syscalls/lgetxattr.S b/libc/arch-x86_64/syscalls/lgetxattr.S
index 8a4cad880..6f195ea51 100644
--- a/libc/arch-x86_64/syscalls/lgetxattr.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/linkat.S b/libc/arch-x86_64/syscalls/linkat.S
index 8dced7d16..b9a2b1435 100644
--- a/libc/arch-x86_64/syscalls/linkat.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/listen.S b/libc/arch-x86_64/syscalls/listen.S
index 7df5662c1..104b51486 100644
--- a/libc/arch-x86_64/syscalls/listen.S
+++ b/libc/arch-x86_64/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)
movl $__NR_listen, %eax
diff --git a/libc/arch-x86_64/syscalls/listxattr.S b/libc/arch-x86_64/syscalls/listxattr.S
index 28bb112ef..fe57e39c9 100644
--- a/libc/arch-x86_64/syscalls/listxattr.S
+++ b/libc/arch-x86_64/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)
movl $__NR_listxattr, %eax
diff --git a/libc/arch-x86_64/syscalls/llistxattr.S b/libc/arch-x86_64/syscalls/llistxattr.S
index 582d8bbf7..aa0a54d7f 100644
--- a/libc/arch-x86_64/syscalls/llistxattr.S
+++ b/libc/arch-x86_64/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)
movl $__NR_llistxattr, %eax
diff --git a/libc/arch-x86_64/syscalls/lremovexattr.S b/libc/arch-x86_64/syscalls/lremovexattr.S
index 0a22a3f2a..4b5ee653b 100644
--- a/libc/arch-x86_64/syscalls/lremovexattr.S
+++ b/libc/arch-x86_64/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)
movl $__NR_lremovexattr, %eax
diff --git a/libc/arch-x86_64/syscalls/lseek.S b/libc/arch-x86_64/syscalls/lseek.S
index bb9b78363..a06b3ec37 100644
--- a/libc/arch-x86_64/syscalls/lseek.S
+++ b/libc/arch-x86_64/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)
movl $__NR_lseek, %eax
diff --git a/libc/arch-x86_64/syscalls/lsetxattr.S b/libc/arch-x86_64/syscalls/lsetxattr.S
index e15803c97..67d93eb3c 100644
--- a/libc/arch-x86_64/syscalls/lsetxattr.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/madvise.S b/libc/arch-x86_64/syscalls/madvise.S
index a8d0e2fa2..e4ef9234d 100644
--- a/libc/arch-x86_64/syscalls/madvise.S
+++ b/libc/arch-x86_64/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)
movl $__NR_madvise, %eax
diff --git a/libc/arch-x86_64/syscalls/mincore.S b/libc/arch-x86_64/syscalls/mincore.S
index 52789cd78..d92755c08 100644
--- a/libc/arch-x86_64/syscalls/mincore.S
+++ b/libc/arch-x86_64/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)
movl $__NR_mincore, %eax
diff --git a/libc/arch-x86_64/syscalls/mkdirat.S b/libc/arch-x86_64/syscalls/mkdirat.S
index 034d8f2e2..9e5dbd60b 100644
--- a/libc/arch-x86_64/syscalls/mkdirat.S
+++ b/libc/arch-x86_64/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)
movl $__NR_mkdirat, %eax
diff --git a/libc/arch-x86_64/syscalls/mknodat.S b/libc/arch-x86_64/syscalls/mknodat.S
index 92dbb5b5d..49aac35cf 100644
--- a/libc/arch-x86_64/syscalls/mknodat.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/mlock.S b/libc/arch-x86_64/syscalls/mlock.S
index 6b5b39953..f0b0c6e46 100644
--- a/libc/arch-x86_64/syscalls/mlock.S
+++ b/libc/arch-x86_64/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)
movl $__NR_mlock, %eax
diff --git a/libc/arch-x86_64/syscalls/mlockall.S b/libc/arch-x86_64/syscalls/mlockall.S
index 382eb0788..420cb03f6 100644
--- a/libc/arch-x86_64/syscalls/mlockall.S
+++ b/libc/arch-x86_64/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)
movl $__NR_mlockall, %eax
diff --git a/libc/arch-x86_64/syscalls/mmap.S b/libc/arch-x86_64/syscalls/mmap.S
index bbee9e72a..d28cc427e 100644
--- a/libc/arch-x86_64/syscalls/mmap.S
+++ b/libc/arch-x86_64/syscalls/mmap.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(mmap)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/mount.S b/libc/arch-x86_64/syscalls/mount.S
index 65cabb282..df488c33e 100644
--- a/libc/arch-x86_64/syscalls/mount.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/mprotect.S b/libc/arch-x86_64/syscalls/mprotect.S
index f065dc12d..9ef61b588 100644
--- a/libc/arch-x86_64/syscalls/mprotect.S
+++ b/libc/arch-x86_64/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)
movl $__NR_mprotect, %eax
diff --git a/libc/arch-x86_64/syscalls/mremap.S b/libc/arch-x86_64/syscalls/mremap.S
index f72d4b92a..55e24bf5a 100644
--- a/libc/arch-x86_64/syscalls/mremap.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/msync.S b/libc/arch-x86_64/syscalls/msync.S
index cc570837c..40524e380 100644
--- a/libc/arch-x86_64/syscalls/msync.S
+++ b/libc/arch-x86_64/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)
movl $__NR_msync, %eax
diff --git a/libc/arch-x86_64/syscalls/munlock.S b/libc/arch-x86_64/syscalls/munlock.S
index dd3fcd3fa..b508259bb 100644
--- a/libc/arch-x86_64/syscalls/munlock.S
+++ b/libc/arch-x86_64/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)
movl $__NR_munlock, %eax
diff --git a/libc/arch-x86_64/syscalls/munlockall.S b/libc/arch-x86_64/syscalls/munlockall.S
index 7e682466e..4314e2b71 100644
--- a/libc/arch-x86_64/syscalls/munlockall.S
+++ b/libc/arch-x86_64/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)
movl $__NR_munlockall, %eax
diff --git a/libc/arch-x86_64/syscalls/munmap.S b/libc/arch-x86_64/syscalls/munmap.S
index 09341175d..15d503c65 100644
--- a/libc/arch-x86_64/syscalls/munmap.S
+++ b/libc/arch-x86_64/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)
movl $__NR_munmap, %eax
diff --git a/libc/arch-x86_64/syscalls/nanosleep.S b/libc/arch-x86_64/syscalls/nanosleep.S
index 3b9b9c96e..d303fcb64 100644
--- a/libc/arch-x86_64/syscalls/nanosleep.S
+++ b/libc/arch-x86_64/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)
movl $__NR_nanosleep, %eax
diff --git a/libc/arch-x86_64/syscalls/perf_event_open.S b/libc/arch-x86_64/syscalls/perf_event_open.S
index 442c96c8f..d9fc71e4f 100644
--- a/libc/arch-x86_64/syscalls/perf_event_open.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/personality.S b/libc/arch-x86_64/syscalls/personality.S
index e2c0e4d28..037970777 100644
--- a/libc/arch-x86_64/syscalls/personality.S
+++ b/libc/arch-x86_64/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)
movl $__NR_personality, %eax
diff --git a/libc/arch-x86_64/syscalls/pipe2.S b/libc/arch-x86_64/syscalls/pipe2.S
index e9acade4f..d0a6768ed 100644
--- a/libc/arch-x86_64/syscalls/pipe2.S
+++ b/libc/arch-x86_64/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)
movl $__NR_pipe2, %eax
diff --git a/libc/arch-x86_64/syscalls/prctl.S b/libc/arch-x86_64/syscalls/prctl.S
index 338bf72d9..f7f561b57 100644
--- a/libc/arch-x86_64/syscalls/prctl.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/pread64.S b/libc/arch-x86_64/syscalls/pread64.S
index 05dc02142..58b317610 100644
--- a/libc/arch-x86_64/syscalls/pread64.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/pwrite64.S b/libc/arch-x86_64/syscalls/pwrite64.S
index a1e0ea121..96215ce35 100644
--- a/libc/arch-x86_64/syscalls/pwrite64.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/read.S b/libc/arch-x86_64/syscalls/read.S
index 6142cfc69..0ff6c2a17 100644
--- a/libc/arch-x86_64/syscalls/read.S
+++ b/libc/arch-x86_64/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)
movl $__NR_read, %eax
diff --git a/libc/arch-x86_64/syscalls/readahead.S b/libc/arch-x86_64/syscalls/readahead.S
index 165b05e9b..a32c1c27d 100644
--- a/libc/arch-x86_64/syscalls/readahead.S
+++ b/libc/arch-x86_64/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)
movl $__NR_readahead, %eax
diff --git a/libc/arch-x86_64/syscalls/readlinkat.S b/libc/arch-x86_64/syscalls/readlinkat.S
index 209e4e977..a1c3adeee 100644
--- a/libc/arch-x86_64/syscalls/readlinkat.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/readv.S b/libc/arch-x86_64/syscalls/readv.S
index a0acc8fc9..a6f51cf5e 100644
--- a/libc/arch-x86_64/syscalls/readv.S
+++ b/libc/arch-x86_64/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)
movl $__NR_readv, %eax
diff --git a/libc/arch-x86_64/syscalls/recvfrom.S b/libc/arch-x86_64/syscalls/recvfrom.S
index 3236802e2..feb3a6326 100644
--- a/libc/arch-x86_64/syscalls/recvfrom.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/recvmsg.S b/libc/arch-x86_64/syscalls/recvmsg.S
index c9e2b1f61..6716aca16 100644
--- a/libc/arch-x86_64/syscalls/recvmsg.S
+++ b/libc/arch-x86_64/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)
movl $__NR_recvmsg, %eax
diff --git a/libc/arch-x86_64/syscalls/removexattr.S b/libc/arch-x86_64/syscalls/removexattr.S
index d360110ae..89b2c4f2d 100644
--- a/libc/arch-x86_64/syscalls/removexattr.S
+++ b/libc/arch-x86_64/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)
movl $__NR_removexattr, %eax
diff --git a/libc/arch-x86_64/syscalls/renameat.S b/libc/arch-x86_64/syscalls/renameat.S
index 403b02fc3..9d69c3e36 100644
--- a/libc/arch-x86_64/syscalls/renameat.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/sched_get_priority_max.S b/libc/arch-x86_64/syscalls/sched_get_priority_max.S
index 0a1973764..41b2d1daa 100644
--- a/libc/arch-x86_64/syscalls/sched_get_priority_max.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sched_get_priority_max, %eax
diff --git a/libc/arch-x86_64/syscalls/sched_get_priority_min.S b/libc/arch-x86_64/syscalls/sched_get_priority_min.S
index 6d55f930f..61b746f2b 100644
--- a/libc/arch-x86_64/syscalls/sched_get_priority_min.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sched_get_priority_min, %eax
diff --git a/libc/arch-x86_64/syscalls/sched_getparam.S b/libc/arch-x86_64/syscalls/sched_getparam.S
index a2144cdf0..23d34b2b7 100644
--- a/libc/arch-x86_64/syscalls/sched_getparam.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sched_getparam, %eax
diff --git a/libc/arch-x86_64/syscalls/sched_getscheduler.S b/libc/arch-x86_64/syscalls/sched_getscheduler.S
index d18bd310a..12f0ba047 100644
--- a/libc/arch-x86_64/syscalls/sched_getscheduler.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sched_getscheduler, %eax
diff --git a/libc/arch-x86_64/syscalls/sched_rr_get_interval.S b/libc/arch-x86_64/syscalls/sched_rr_get_interval.S
index fb2daeb3a..0ff852fa3 100644
--- a/libc/arch-x86_64/syscalls/sched_rr_get_interval.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sched_rr_get_interval, %eax
diff --git a/libc/arch-x86_64/syscalls/sched_setaffinity.S b/libc/arch-x86_64/syscalls/sched_setaffinity.S
index 2ae5351f9..250ecb658 100644
--- a/libc/arch-x86_64/syscalls/sched_setaffinity.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sched_setaffinity, %eax
diff --git a/libc/arch-x86_64/syscalls/sched_setparam.S b/libc/arch-x86_64/syscalls/sched_setparam.S
index 8a88ff802..30a7963c1 100644
--- a/libc/arch-x86_64/syscalls/sched_setparam.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sched_setparam, %eax
diff --git a/libc/arch-x86_64/syscalls/sched_setscheduler.S b/libc/arch-x86_64/syscalls/sched_setscheduler.S
index b0fd8d2d3..137f9f0d5 100644
--- a/libc/arch-x86_64/syscalls/sched_setscheduler.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sched_setscheduler, %eax
diff --git a/libc/arch-x86_64/syscalls/sched_yield.S b/libc/arch-x86_64/syscalls/sched_yield.S
index 89cd48d83..097c7dcc7 100644
--- a/libc/arch-x86_64/syscalls/sched_yield.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sched_yield, %eax
diff --git a/libc/arch-x86_64/syscalls/sendfile.S b/libc/arch-x86_64/syscalls/sendfile.S
index 4aa2a31ba..b56f487e9 100644
--- a/libc/arch-x86_64/syscalls/sendfile.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/sendmsg.S b/libc/arch-x86_64/syscalls/sendmsg.S
index 28f72c75e..e56e58c46 100644
--- a/libc/arch-x86_64/syscalls/sendmsg.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sendmsg, %eax
diff --git a/libc/arch-x86_64/syscalls/sendto.S b/libc/arch-x86_64/syscalls/sendto.S
index 5a886b890..f0c14b0e0 100644
--- a/libc/arch-x86_64/syscalls/sendto.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/setgid.S b/libc/arch-x86_64/syscalls/setgid.S
index 8d957e405..abaf34314 100644
--- a/libc/arch-x86_64/syscalls/setgid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setgid, %eax
diff --git a/libc/arch-x86_64/syscalls/setgroups.S b/libc/arch-x86_64/syscalls/setgroups.S
index 55a1bb14c..4bbc7ec54 100644
--- a/libc/arch-x86_64/syscalls/setgroups.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setgroups, %eax
diff --git a/libc/arch-x86_64/syscalls/setitimer.S b/libc/arch-x86_64/syscalls/setitimer.S
index 1b343c0db..da81d0b4f 100644
--- a/libc/arch-x86_64/syscalls/setitimer.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setitimer, %eax
diff --git a/libc/arch-x86_64/syscalls/setpgid.S b/libc/arch-x86_64/syscalls/setpgid.S
index 6bd9cdb6e..6dfefa372 100644
--- a/libc/arch-x86_64/syscalls/setpgid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setpgid, %eax
diff --git a/libc/arch-x86_64/syscalls/setpriority.S b/libc/arch-x86_64/syscalls/setpriority.S
index ce4755fd2..89770e93a 100644
--- a/libc/arch-x86_64/syscalls/setpriority.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setpriority, %eax
diff --git a/libc/arch-x86_64/syscalls/setregid.S b/libc/arch-x86_64/syscalls/setregid.S
index 9a3b81a85..9eaa7e901 100644
--- a/libc/arch-x86_64/syscalls/setregid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setregid, %eax
diff --git a/libc/arch-x86_64/syscalls/setresgid.S b/libc/arch-x86_64/syscalls/setresgid.S
index 6b34fef5b..95206b314 100644
--- a/libc/arch-x86_64/syscalls/setresgid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setresgid, %eax
diff --git a/libc/arch-x86_64/syscalls/setresuid.S b/libc/arch-x86_64/syscalls/setresuid.S
index 1cf73bec4..c42dda9e8 100644
--- a/libc/arch-x86_64/syscalls/setresuid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setresuid, %eax
diff --git a/libc/arch-x86_64/syscalls/setreuid.S b/libc/arch-x86_64/syscalls/setreuid.S
index 96e6738ff..935f7516e 100644
--- a/libc/arch-x86_64/syscalls/setreuid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setreuid, %eax
diff --git a/libc/arch-x86_64/syscalls/setrlimit.S b/libc/arch-x86_64/syscalls/setrlimit.S
index 3730db09a..de5b3b71a 100644
--- a/libc/arch-x86_64/syscalls/setrlimit.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setrlimit, %eax
diff --git a/libc/arch-x86_64/syscalls/setsid.S b/libc/arch-x86_64/syscalls/setsid.S
index 317867de1..9c50a89da 100644
--- a/libc/arch-x86_64/syscalls/setsid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setsid, %eax
diff --git a/libc/arch-x86_64/syscalls/setsockopt.S b/libc/arch-x86_64/syscalls/setsockopt.S
index aba96ce58..2332ec944 100644
--- a/libc/arch-x86_64/syscalls/setsockopt.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/settimeofday.S b/libc/arch-x86_64/syscalls/settimeofday.S
index 4d4ca26e5..121c0b6fe 100644
--- a/libc/arch-x86_64/syscalls/settimeofday.S
+++ b/libc/arch-x86_64/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)
movl $__NR_settimeofday, %eax
diff --git a/libc/arch-x86_64/syscalls/setuid.S b/libc/arch-x86_64/syscalls/setuid.S
index 33d73acba..f42670550 100644
--- a/libc/arch-x86_64/syscalls/setuid.S
+++ b/libc/arch-x86_64/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)
movl $__NR_setuid, %eax
diff --git a/libc/arch-x86_64/syscalls/setxattr.S b/libc/arch-x86_64/syscalls/setxattr.S
index e7f958afa..c02aa84aa 100644
--- a/libc/arch-x86_64/syscalls/setxattr.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/shutdown.S b/libc/arch-x86_64/syscalls/shutdown.S
index b7fcd4f1d..96a65f838 100644
--- a/libc/arch-x86_64/syscalls/shutdown.S
+++ b/libc/arch-x86_64/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)
movl $__NR_shutdown, %eax
diff --git a/libc/arch-x86_64/syscalls/sigaltstack.S b/libc/arch-x86_64/syscalls/sigaltstack.S
index 2c6327469..57dc41a67 100644
--- a/libc/arch-x86_64/syscalls/sigaltstack.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sigaltstack, %eax
diff --git a/libc/arch-x86_64/syscalls/signalfd4.S b/libc/arch-x86_64/syscalls/signalfd4.S
index 84c01eca7..4d8a1b6d8 100644
--- a/libc/arch-x86_64/syscalls/signalfd4.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/socket.S b/libc/arch-x86_64/syscalls/socket.S
index 22645e71b..9665ee42b 100644
--- a/libc/arch-x86_64/syscalls/socket.S
+++ b/libc/arch-x86_64/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)
movl $__NR_socket, %eax
diff --git a/libc/arch-x86_64/syscalls/socketpair.S b/libc/arch-x86_64/syscalls/socketpair.S
index 2b1e81ee5..4e76e833f 100644
--- a/libc/arch-x86_64/syscalls/socketpair.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/statfs.S b/libc/arch-x86_64/syscalls/statfs.S
index 8929396c8..8b4b2e5e2 100644
--- a/libc/arch-x86_64/syscalls/statfs.S
+++ b/libc/arch-x86_64/syscalls/statfs.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(statfs)
movl $__NR_statfs, %eax
diff --git a/libc/arch-x86_64/syscalls/swapoff.S b/libc/arch-x86_64/syscalls/swapoff.S
index 960b812d0..2f2dafee3 100644
--- a/libc/arch-x86_64/syscalls/swapoff.S
+++ b/libc/arch-x86_64/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)
movl $__NR_swapoff, %eax
diff --git a/libc/arch-x86_64/syscalls/swapon.S b/libc/arch-x86_64/syscalls/swapon.S
index e466c8609..3db792114 100644
--- a/libc/arch-x86_64/syscalls/swapon.S
+++ b/libc/arch-x86_64/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)
movl $__NR_swapon, %eax
diff --git a/libc/arch-x86_64/syscalls/symlinkat.S b/libc/arch-x86_64/syscalls/symlinkat.S
index 3da76f270..54b4d4e68 100644
--- a/libc/arch-x86_64/syscalls/symlinkat.S
+++ b/libc/arch-x86_64/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)
movl $__NR_symlinkat, %eax
diff --git a/libc/arch-x86_64/syscalls/sync.S b/libc/arch-x86_64/syscalls/sync.S
index feaad4367..f58c78872 100644
--- a/libc/arch-x86_64/syscalls/sync.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sync, %eax
diff --git a/libc/arch-x86_64/syscalls/sysinfo.S b/libc/arch-x86_64/syscalls/sysinfo.S
index facf1e012..d48369319 100644
--- a/libc/arch-x86_64/syscalls/sysinfo.S
+++ b/libc/arch-x86_64/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)
movl $__NR_sysinfo, %eax
diff --git a/libc/arch-x86_64/syscalls/tgkill.S b/libc/arch-x86_64/syscalls/tgkill.S
index 78228123d..7d217b033 100644
--- a/libc/arch-x86_64/syscalls/tgkill.S
+++ b/libc/arch-x86_64/syscalls/tgkill.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(tgkill)
movl $__NR_tgkill, %eax
diff --git a/libc/arch-x86_64/syscalls/timerfd_create.S b/libc/arch-x86_64/syscalls/timerfd_create.S
index c201e97cc..a518e4f9b 100644
--- a/libc/arch-x86_64/syscalls/timerfd_create.S
+++ b/libc/arch-x86_64/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)
movl $__NR_timerfd_create, %eax
diff --git a/libc/arch-x86_64/syscalls/timerfd_gettime.S b/libc/arch-x86_64/syscalls/timerfd_gettime.S
index 73132d30b..1d0853af5 100644
--- a/libc/arch-x86_64/syscalls/timerfd_gettime.S
+++ b/libc/arch-x86_64/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)
movl $__NR_timerfd_gettime, %eax
diff --git a/libc/arch-x86_64/syscalls/timerfd_settime.S b/libc/arch-x86_64/syscalls/timerfd_settime.S
index 6c6f54ae1..a23af4ec6 100644
--- a/libc/arch-x86_64/syscalls/timerfd_settime.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/times.S b/libc/arch-x86_64/syscalls/times.S
index ec7010a4c..520d062dd 100644
--- a/libc/arch-x86_64/syscalls/times.S
+++ b/libc/arch-x86_64/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)
movl $__NR_times, %eax
diff --git a/libc/arch-x86_64/syscalls/tkill.S b/libc/arch-x86_64/syscalls/tkill.S
index 05d748ed1..d8529efee 100644
--- a/libc/arch-x86_64/syscalls/tkill.S
+++ b/libc/arch-x86_64/syscalls/tkill.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(tkill)
movl $__NR_tkill, %eax
diff --git a/libc/arch-x86_64/syscalls/truncate.S b/libc/arch-x86_64/syscalls/truncate.S
index 6da314078..5e5eb8eaf 100644
--- a/libc/arch-x86_64/syscalls/truncate.S
+++ b/libc/arch-x86_64/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)
movl $__NR_truncate, %eax
diff --git a/libc/arch-x86_64/syscalls/umask.S b/libc/arch-x86_64/syscalls/umask.S
index 441fc4f05..360ad7177 100644
--- a/libc/arch-x86_64/syscalls/umask.S
+++ b/libc/arch-x86_64/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)
movl $__NR_umask, %eax
diff --git a/libc/arch-x86_64/syscalls/umount2.S b/libc/arch-x86_64/syscalls/umount2.S
index 3ff02845b..e2de44b72 100644
--- a/libc/arch-x86_64/syscalls/umount2.S
+++ b/libc/arch-x86_64/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)
movl $__NR_umount2, %eax
diff --git a/libc/arch-x86_64/syscalls/uname.S b/libc/arch-x86_64/syscalls/uname.S
index 87c3afea3..8ad40fa38 100644
--- a/libc/arch-x86_64/syscalls/uname.S
+++ b/libc/arch-x86_64/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)
movl $__NR_uname, %eax
diff --git a/libc/arch-x86_64/syscalls/unlinkat.S b/libc/arch-x86_64/syscalls/unlinkat.S
index fe9f47e25..83bb59f15 100644
--- a/libc/arch-x86_64/syscalls/unlinkat.S
+++ b/libc/arch-x86_64/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)
movl $__NR_unlinkat, %eax
diff --git a/libc/arch-x86_64/syscalls/unshare.S b/libc/arch-x86_64/syscalls/unshare.S
index ef5fbc68b..044af99a9 100644
--- a/libc/arch-x86_64/syscalls/unshare.S
+++ b/libc/arch-x86_64/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)
movl $__NR_unshare, %eax
diff --git a/libc/arch-x86_64/syscalls/utimensat.S b/libc/arch-x86_64/syscalls/utimensat.S
index 503387765..4d263fff0 100644
--- a/libc/arch-x86_64/syscalls/utimensat.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/wait4.S b/libc/arch-x86_64/syscalls/wait4.S
index 26efe0ed7..7de78ac40 100644
--- a/libc/arch-x86_64/syscalls/wait4.S
+++ b/libc/arch-x86_64/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)
movq %rcx, %r10
diff --git a/libc/arch-x86_64/syscalls/write.S b/libc/arch-x86_64/syscalls/write.S
index 8601658ed..eab390404 100644
--- a/libc/arch-x86_64/syscalls/write.S
+++ b/libc/arch-x86_64/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)
movl $__NR_write, %eax
diff --git a/libc/arch-x86_64/syscalls/writev.S b/libc/arch-x86_64/syscalls/writev.S
index 15c4b8126..b21e3d64d 100644
--- a/libc/arch-x86_64/syscalls/writev.S
+++ b/libc/arch-x86_64/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)
movl $__NR_writev, %eax
diff --git a/libc/private/bionic_asm.h b/libc/private/bionic_asm.h
new file mode 100644
index 000000000..e6ce65c9e
--- /dev/null
+++ b/libc/private/bionic_asm.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _PRIVATE_BIONIC_ASM_H_
+#define _PRIVATE_BIONIC_ASM_H_
+
+#include <machine/asm.h>
+
+#include <asm/unistd.h> /* For system call numbers. */
+#define MAX_ERRNO 4095 /* For recognizing system call error returns. */
+
+/* TODO: add ENTRY_PRIVATE. */
+/* TODO: add ASM_ALIAS macro. */
+
+#endif /* _PRIVATE_BIONIC_ASM_H_ */
diff --git a/libc/tools/gensyscalls.py b/libc/tools/gensyscalls.py
index bf44b7031..d0a8f273a 100755
--- a/libc/tools/gensyscalls.py
+++ b/libc/tools/gensyscalls.py
@@ -41,9 +41,7 @@ def create_file(relpath):
syscall_stub_header = "/* " + warning + " */\n" + \
"""
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
ENTRY(%(func)s)
"""