diff --git a/libc/Android.mk b/libc/Android.mk
index c6fffb1..e70145d 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1,16 +1,12 @@
 LOCAL_PATH := $(call my-dir)
 
-include $(LOCAL_PATH)/arch-$(TARGET_ARCH)/syscalls.mk
-
 # Make everything depend on any changes to included makefiles.
 libc_common_additional_dependencies := \
-    $(LOCAL_PATH)/arch-$(TARGET_ARCH)/syscalls.mk \
     $(LOCAL_PATH)/Android.mk \
 
 # Define the common source files for all the libc instances
 # =========================================================
 libc_common_src_files := \
-	$(syscall_src) \
 	unistd/alarm.c \
 	unistd/exec.c \
 	unistd/fnmatch.c \
@@ -929,6 +925,20 @@
 
 
 # ========================================================
+# libc_syscalls.a
+# ========================================================
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-S-files-under,arch-$(TARGET_ARCH)/syscalls)
+LOCAL_MODULE := libc_syscalls
+LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
+LOCAL_SYSTEM_SHARED_LIBRARIES :=
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+# ========================================================
 # libc_common.a
 # ========================================================
 
@@ -947,6 +957,7 @@
     libc_dns \
     libc_freebsd \
     libc_netbsd \
+    libc_syscalls \
     libc_tzcode \
 
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
diff --git a/libc/arch-arm/syscalls.mk b/libc/arch-arm/syscalls.mk
deleted file mode 100644
index f039bcb..0000000
--- a/libc/arch-arm/syscalls.mk
+++ /dev/null
@@ -1,199 +0,0 @@
-# Generated by gensyscalls.py. Do not edit.
-syscall_src :=
-syscall_src += arch-arm/syscalls/__brk.S
-syscall_src += arch-arm/syscalls/__epoll_pwait.S
-syscall_src += arch-arm/syscalls/__exit.S
-syscall_src += arch-arm/syscalls/__fcntl64.S
-syscall_src += arch-arm/syscalls/__fstatfs64.S
-syscall_src += arch-arm/syscalls/__getcpu.S
-syscall_src += arch-arm/syscalls/__getcwd.S
-syscall_src += arch-arm/syscalls/__getpriority.S
-syscall_src += arch-arm/syscalls/__ioctl.S
-syscall_src += arch-arm/syscalls/__llseek.S
-syscall_src += arch-arm/syscalls/__mmap2.S
-syscall_src += arch-arm/syscalls/__openat.S
-syscall_src += arch-arm/syscalls/__ppoll.S
-syscall_src += arch-arm/syscalls/__pselect6.S
-syscall_src += arch-arm/syscalls/__ptrace.S
-syscall_src += arch-arm/syscalls/__reboot.S
-syscall_src += arch-arm/syscalls/__rt_sigaction.S
-syscall_src += arch-arm/syscalls/__rt_sigpending.S
-syscall_src += arch-arm/syscalls/__rt_sigprocmask.S
-syscall_src += arch-arm/syscalls/__rt_sigsuspend.S
-syscall_src += arch-arm/syscalls/__rt_sigtimedwait.S
-syscall_src += arch-arm/syscalls/__sched_getaffinity.S
-syscall_src += arch-arm/syscalls/__set_tid_address.S
-syscall_src += arch-arm/syscalls/__set_tls.S
-syscall_src += arch-arm/syscalls/__sigaction.S
-syscall_src += arch-arm/syscalls/__statfs64.S
-syscall_src += arch-arm/syscalls/__syslog.S
-syscall_src += arch-arm/syscalls/__timer_create.S
-syscall_src += arch-arm/syscalls/__timer_delete.S
-syscall_src += arch-arm/syscalls/__timer_getoverrun.S
-syscall_src += arch-arm/syscalls/__timer_gettime.S
-syscall_src += arch-arm/syscalls/__timer_settime.S
-syscall_src += arch-arm/syscalls/__waitid.S
-syscall_src += arch-arm/syscalls/_exit.S
-syscall_src += arch-arm/syscalls/accept.S
-syscall_src += arch-arm/syscalls/acct.S
-syscall_src += arch-arm/syscalls/bind.S
-syscall_src += arch-arm/syscalls/cacheflush.S
-syscall_src += arch-arm/syscalls/capget.S
-syscall_src += arch-arm/syscalls/capset.S
-syscall_src += arch-arm/syscalls/chdir.S
-syscall_src += arch-arm/syscalls/chroot.S
-syscall_src += arch-arm/syscalls/clock_getres.S
-syscall_src += arch-arm/syscalls/clock_gettime.S
-syscall_src += arch-arm/syscalls/clock_nanosleep.S
-syscall_src += arch-arm/syscalls/clock_settime.S
-syscall_src += arch-arm/syscalls/close.S
-syscall_src += arch-arm/syscalls/connect.S
-syscall_src += arch-arm/syscalls/delete_module.S
-syscall_src += arch-arm/syscalls/dup.S
-syscall_src += arch-arm/syscalls/dup3.S
-syscall_src += arch-arm/syscalls/epoll_create1.S
-syscall_src += arch-arm/syscalls/epoll_ctl.S
-syscall_src += arch-arm/syscalls/eventfd.S
-syscall_src += arch-arm/syscalls/execve.S
-syscall_src += arch-arm/syscalls/faccessat.S
-syscall_src += arch-arm/syscalls/fallocate64.S
-syscall_src += arch-arm/syscalls/fchdir.S
-syscall_src += arch-arm/syscalls/fchmod.S
-syscall_src += arch-arm/syscalls/fchmodat.S
-syscall_src += arch-arm/syscalls/fchown.S
-syscall_src += arch-arm/syscalls/fchownat.S
-syscall_src += arch-arm/syscalls/fdatasync.S
-syscall_src += arch-arm/syscalls/fgetxattr.S
-syscall_src += arch-arm/syscalls/flistxattr.S
-syscall_src += arch-arm/syscalls/flock.S
-syscall_src += arch-arm/syscalls/fremovexattr.S
-syscall_src += arch-arm/syscalls/fsetxattr.S
-syscall_src += arch-arm/syscalls/fstat.S
-syscall_src += arch-arm/syscalls/fstatat.S
-syscall_src += arch-arm/syscalls/fsync.S
-syscall_src += arch-arm/syscalls/ftruncate.S
-syscall_src += arch-arm/syscalls/ftruncate64.S
-syscall_src += arch-arm/syscalls/futex.S
-syscall_src += arch-arm/syscalls/getdents.S
-syscall_src += arch-arm/syscalls/getegid.S
-syscall_src += arch-arm/syscalls/geteuid.S
-syscall_src += arch-arm/syscalls/getgid.S
-syscall_src += arch-arm/syscalls/getgroups.S
-syscall_src += arch-arm/syscalls/getitimer.S
-syscall_src += arch-arm/syscalls/getpeername.S
-syscall_src += arch-arm/syscalls/getpgid.S
-syscall_src += arch-arm/syscalls/getpid.S
-syscall_src += arch-arm/syscalls/getppid.S
-syscall_src += arch-arm/syscalls/getresgid.S
-syscall_src += arch-arm/syscalls/getresuid.S
-syscall_src += arch-arm/syscalls/getrlimit.S
-syscall_src += arch-arm/syscalls/getrusage.S
-syscall_src += arch-arm/syscalls/getsid.S
-syscall_src += arch-arm/syscalls/getsockname.S
-syscall_src += arch-arm/syscalls/getsockopt.S
-syscall_src += arch-arm/syscalls/gettid.S
-syscall_src += arch-arm/syscalls/gettimeofday.S
-syscall_src += arch-arm/syscalls/getuid.S
-syscall_src += arch-arm/syscalls/getxattr.S
-syscall_src += arch-arm/syscalls/init_module.S
-syscall_src += arch-arm/syscalls/inotify_add_watch.S
-syscall_src += arch-arm/syscalls/inotify_init1.S
-syscall_src += arch-arm/syscalls/inotify_rm_watch.S
-syscall_src += arch-arm/syscalls/ioprio_get.S
-syscall_src += arch-arm/syscalls/ioprio_set.S
-syscall_src += arch-arm/syscalls/kill.S
-syscall_src += arch-arm/syscalls/klogctl.S
-syscall_src += arch-arm/syscalls/lgetxattr.S
-syscall_src += arch-arm/syscalls/linkat.S
-syscall_src += arch-arm/syscalls/listen.S
-syscall_src += arch-arm/syscalls/listxattr.S
-syscall_src += arch-arm/syscalls/llistxattr.S
-syscall_src += arch-arm/syscalls/lremovexattr.S
-syscall_src += arch-arm/syscalls/lseek.S
-syscall_src += arch-arm/syscalls/lsetxattr.S
-syscall_src += arch-arm/syscalls/madvise.S
-syscall_src += arch-arm/syscalls/mincore.S
-syscall_src += arch-arm/syscalls/mkdirat.S
-syscall_src += arch-arm/syscalls/mknodat.S
-syscall_src += arch-arm/syscalls/mlock.S
-syscall_src += arch-arm/syscalls/mlockall.S
-syscall_src += arch-arm/syscalls/mount.S
-syscall_src += arch-arm/syscalls/mprotect.S
-syscall_src += arch-arm/syscalls/mremap.S
-syscall_src += arch-arm/syscalls/msync.S
-syscall_src += arch-arm/syscalls/munlock.S
-syscall_src += arch-arm/syscalls/munlockall.S
-syscall_src += arch-arm/syscalls/munmap.S
-syscall_src += arch-arm/syscalls/nanosleep.S
-syscall_src += arch-arm/syscalls/perf_event_open.S
-syscall_src += arch-arm/syscalls/personality.S
-syscall_src += arch-arm/syscalls/pipe2.S
-syscall_src += arch-arm/syscalls/prctl.S
-syscall_src += arch-arm/syscalls/pread64.S
-syscall_src += arch-arm/syscalls/prlimit64.S
-syscall_src += arch-arm/syscalls/pwrite64.S
-syscall_src += arch-arm/syscalls/read.S
-syscall_src += arch-arm/syscalls/readahead.S
-syscall_src += arch-arm/syscalls/readlinkat.S
-syscall_src += arch-arm/syscalls/readv.S
-syscall_src += arch-arm/syscalls/recvfrom.S
-syscall_src += arch-arm/syscalls/recvmsg.S
-syscall_src += arch-arm/syscalls/removexattr.S
-syscall_src += arch-arm/syscalls/renameat.S
-syscall_src += arch-arm/syscalls/sched_get_priority_max.S
-syscall_src += arch-arm/syscalls/sched_get_priority_min.S
-syscall_src += arch-arm/syscalls/sched_getparam.S
-syscall_src += arch-arm/syscalls/sched_getscheduler.S
-syscall_src += arch-arm/syscalls/sched_rr_get_interval.S
-syscall_src += arch-arm/syscalls/sched_setaffinity.S
-syscall_src += arch-arm/syscalls/sched_setparam.S
-syscall_src += arch-arm/syscalls/sched_setscheduler.S
-syscall_src += arch-arm/syscalls/sched_yield.S
-syscall_src += arch-arm/syscalls/sendfile.S
-syscall_src += arch-arm/syscalls/sendfile64.S
-syscall_src += arch-arm/syscalls/sendmsg.S
-syscall_src += arch-arm/syscalls/sendto.S
-syscall_src += arch-arm/syscalls/setgid.S
-syscall_src += arch-arm/syscalls/setgroups.S
-syscall_src += arch-arm/syscalls/setitimer.S
-syscall_src += arch-arm/syscalls/setns.S
-syscall_src += arch-arm/syscalls/setpgid.S
-syscall_src += arch-arm/syscalls/setpriority.S
-syscall_src += arch-arm/syscalls/setregid.S
-syscall_src += arch-arm/syscalls/setresgid.S
-syscall_src += arch-arm/syscalls/setresuid.S
-syscall_src += arch-arm/syscalls/setreuid.S
-syscall_src += arch-arm/syscalls/setrlimit.S
-syscall_src += arch-arm/syscalls/setsid.S
-syscall_src += arch-arm/syscalls/setsockopt.S
-syscall_src += arch-arm/syscalls/settimeofday.S
-syscall_src += arch-arm/syscalls/setuid.S
-syscall_src += arch-arm/syscalls/setxattr.S
-syscall_src += arch-arm/syscalls/shutdown.S
-syscall_src += arch-arm/syscalls/sigaltstack.S
-syscall_src += arch-arm/syscalls/signalfd4.S
-syscall_src += arch-arm/syscalls/socket.S
-syscall_src += arch-arm/syscalls/socketpair.S
-syscall_src += arch-arm/syscalls/swapoff.S
-syscall_src += arch-arm/syscalls/swapon.S
-syscall_src += arch-arm/syscalls/symlinkat.S
-syscall_src += arch-arm/syscalls/sync.S
-syscall_src += arch-arm/syscalls/sysinfo.S
-syscall_src += arch-arm/syscalls/tgkill.S
-syscall_src += arch-arm/syscalls/timerfd_create.S
-syscall_src += arch-arm/syscalls/timerfd_gettime.S
-syscall_src += arch-arm/syscalls/timerfd_settime.S
-syscall_src += arch-arm/syscalls/times.S
-syscall_src += arch-arm/syscalls/tkill.S
-syscall_src += arch-arm/syscalls/truncate.S
-syscall_src += arch-arm/syscalls/truncate64.S
-syscall_src += arch-arm/syscalls/umask.S
-syscall_src += arch-arm/syscalls/umount2.S
-syscall_src += arch-arm/syscalls/uname.S
-syscall_src += arch-arm/syscalls/unlinkat.S
-syscall_src += arch-arm/syscalls/unshare.S
-syscall_src += arch-arm/syscalls/utimensat.S
-syscall_src += arch-arm/syscalls/vfork.S
-syscall_src += arch-arm/syscalls/wait4.S
-syscall_src += arch-arm/syscalls/write.S
-syscall_src += arch-arm/syscalls/writev.S
diff --git a/libc/arch-arm64/syscalls.mk b/libc/arch-arm64/syscalls.mk
deleted file mode 100644
index 07ad5d5..0000000
--- a/libc/arch-arm64/syscalls.mk
+++ /dev/null
@@ -1,191 +0,0 @@
-# Generated by gensyscalls.py. Do not edit.
-syscall_src :=
-syscall_src += arch-arm64/syscalls/__brk.S
-syscall_src += arch-arm64/syscalls/__epoll_pwait.S
-syscall_src += arch-arm64/syscalls/__exit.S
-syscall_src += arch-arm64/syscalls/__getcpu.S
-syscall_src += arch-arm64/syscalls/__getcwd.S
-syscall_src += arch-arm64/syscalls/__getpriority.S
-syscall_src += arch-arm64/syscalls/__ioctl.S
-syscall_src += arch-arm64/syscalls/__openat.S
-syscall_src += arch-arm64/syscalls/__ppoll.S
-syscall_src += arch-arm64/syscalls/__pselect6.S
-syscall_src += arch-arm64/syscalls/__ptrace.S
-syscall_src += arch-arm64/syscalls/__reboot.S
-syscall_src += arch-arm64/syscalls/__rt_sigaction.S
-syscall_src += arch-arm64/syscalls/__rt_sigpending.S
-syscall_src += arch-arm64/syscalls/__rt_sigprocmask.S
-syscall_src += arch-arm64/syscalls/__rt_sigsuspend.S
-syscall_src += arch-arm64/syscalls/__rt_sigtimedwait.S
-syscall_src += arch-arm64/syscalls/__sched_getaffinity.S
-syscall_src += arch-arm64/syscalls/__set_tid_address.S
-syscall_src += arch-arm64/syscalls/__syslog.S
-syscall_src += arch-arm64/syscalls/__timer_create.S
-syscall_src += arch-arm64/syscalls/__timer_delete.S
-syscall_src += arch-arm64/syscalls/__timer_getoverrun.S
-syscall_src += arch-arm64/syscalls/__timer_gettime.S
-syscall_src += arch-arm64/syscalls/__timer_settime.S
-syscall_src += arch-arm64/syscalls/__waitid.S
-syscall_src += arch-arm64/syscalls/_exit.S
-syscall_src += arch-arm64/syscalls/accept.S
-syscall_src += arch-arm64/syscalls/acct.S
-syscall_src += arch-arm64/syscalls/bind.S
-syscall_src += arch-arm64/syscalls/capget.S
-syscall_src += arch-arm64/syscalls/capset.S
-syscall_src += arch-arm64/syscalls/chdir.S
-syscall_src += arch-arm64/syscalls/chroot.S
-syscall_src += arch-arm64/syscalls/clock_getres.S
-syscall_src += arch-arm64/syscalls/clock_gettime.S
-syscall_src += arch-arm64/syscalls/clock_nanosleep.S
-syscall_src += arch-arm64/syscalls/clock_settime.S
-syscall_src += arch-arm64/syscalls/close.S
-syscall_src += arch-arm64/syscalls/connect.S
-syscall_src += arch-arm64/syscalls/delete_module.S
-syscall_src += arch-arm64/syscalls/dup.S
-syscall_src += arch-arm64/syscalls/dup3.S
-syscall_src += arch-arm64/syscalls/epoll_create1.S
-syscall_src += arch-arm64/syscalls/epoll_ctl.S
-syscall_src += arch-arm64/syscalls/eventfd.S
-syscall_src += arch-arm64/syscalls/execve.S
-syscall_src += arch-arm64/syscalls/faccessat.S
-syscall_src += arch-arm64/syscalls/fallocate.S
-syscall_src += arch-arm64/syscalls/fchdir.S
-syscall_src += arch-arm64/syscalls/fchmod.S
-syscall_src += arch-arm64/syscalls/fchmodat.S
-syscall_src += arch-arm64/syscalls/fchown.S
-syscall_src += arch-arm64/syscalls/fchownat.S
-syscall_src += arch-arm64/syscalls/fcntl.S
-syscall_src += arch-arm64/syscalls/fdatasync.S
-syscall_src += arch-arm64/syscalls/fgetxattr.S
-syscall_src += arch-arm64/syscalls/flistxattr.S
-syscall_src += arch-arm64/syscalls/flock.S
-syscall_src += arch-arm64/syscalls/fremovexattr.S
-syscall_src += arch-arm64/syscalls/fsetxattr.S
-syscall_src += arch-arm64/syscalls/fstat.S
-syscall_src += arch-arm64/syscalls/fstatat.S
-syscall_src += arch-arm64/syscalls/fstatfs.S
-syscall_src += arch-arm64/syscalls/fsync.S
-syscall_src += arch-arm64/syscalls/ftruncate.S
-syscall_src += arch-arm64/syscalls/futex.S
-syscall_src += arch-arm64/syscalls/getdents.S
-syscall_src += arch-arm64/syscalls/getegid.S
-syscall_src += arch-arm64/syscalls/geteuid.S
-syscall_src += arch-arm64/syscalls/getgid.S
-syscall_src += arch-arm64/syscalls/getgroups.S
-syscall_src += arch-arm64/syscalls/getitimer.S
-syscall_src += arch-arm64/syscalls/getpeername.S
-syscall_src += arch-arm64/syscalls/getpgid.S
-syscall_src += arch-arm64/syscalls/getpid.S
-syscall_src += arch-arm64/syscalls/getppid.S
-syscall_src += arch-arm64/syscalls/getresgid.S
-syscall_src += arch-arm64/syscalls/getresuid.S
-syscall_src += arch-arm64/syscalls/getrlimit.S
-syscall_src += arch-arm64/syscalls/getrusage.S
-syscall_src += arch-arm64/syscalls/getsid.S
-syscall_src += arch-arm64/syscalls/getsockname.S
-syscall_src += arch-arm64/syscalls/getsockopt.S
-syscall_src += arch-arm64/syscalls/gettid.S
-syscall_src += arch-arm64/syscalls/gettimeofday.S
-syscall_src += arch-arm64/syscalls/getuid.S
-syscall_src += arch-arm64/syscalls/getxattr.S
-syscall_src += arch-arm64/syscalls/init_module.S
-syscall_src += arch-arm64/syscalls/inotify_add_watch.S
-syscall_src += arch-arm64/syscalls/inotify_init1.S
-syscall_src += arch-arm64/syscalls/inotify_rm_watch.S
-syscall_src += arch-arm64/syscalls/ioprio_get.S
-syscall_src += arch-arm64/syscalls/ioprio_set.S
-syscall_src += arch-arm64/syscalls/kill.S
-syscall_src += arch-arm64/syscalls/klogctl.S
-syscall_src += arch-arm64/syscalls/lgetxattr.S
-syscall_src += arch-arm64/syscalls/linkat.S
-syscall_src += arch-arm64/syscalls/listen.S
-syscall_src += arch-arm64/syscalls/listxattr.S
-syscall_src += arch-arm64/syscalls/llistxattr.S
-syscall_src += arch-arm64/syscalls/lremovexattr.S
-syscall_src += arch-arm64/syscalls/lseek.S
-syscall_src += arch-arm64/syscalls/lsetxattr.S
-syscall_src += arch-arm64/syscalls/madvise.S
-syscall_src += arch-arm64/syscalls/mincore.S
-syscall_src += arch-arm64/syscalls/mkdirat.S
-syscall_src += arch-arm64/syscalls/mknodat.S
-syscall_src += arch-arm64/syscalls/mlock.S
-syscall_src += arch-arm64/syscalls/mlockall.S
-syscall_src += arch-arm64/syscalls/mmap.S
-syscall_src += arch-arm64/syscalls/mount.S
-syscall_src += arch-arm64/syscalls/mprotect.S
-syscall_src += arch-arm64/syscalls/mremap.S
-syscall_src += arch-arm64/syscalls/msync.S
-syscall_src += arch-arm64/syscalls/munlock.S
-syscall_src += arch-arm64/syscalls/munlockall.S
-syscall_src += arch-arm64/syscalls/munmap.S
-syscall_src += arch-arm64/syscalls/nanosleep.S
-syscall_src += arch-arm64/syscalls/perf_event_open.S
-syscall_src += arch-arm64/syscalls/personality.S
-syscall_src += arch-arm64/syscalls/pipe2.S
-syscall_src += arch-arm64/syscalls/prctl.S
-syscall_src += arch-arm64/syscalls/pread64.S
-syscall_src += arch-arm64/syscalls/prlimit64.S
-syscall_src += arch-arm64/syscalls/pwrite64.S
-syscall_src += arch-arm64/syscalls/read.S
-syscall_src += arch-arm64/syscalls/readahead.S
-syscall_src += arch-arm64/syscalls/readlinkat.S
-syscall_src += arch-arm64/syscalls/readv.S
-syscall_src += arch-arm64/syscalls/recvfrom.S
-syscall_src += arch-arm64/syscalls/recvmsg.S
-syscall_src += arch-arm64/syscalls/removexattr.S
-syscall_src += arch-arm64/syscalls/renameat.S
-syscall_src += arch-arm64/syscalls/sched_get_priority_max.S
-syscall_src += arch-arm64/syscalls/sched_get_priority_min.S
-syscall_src += arch-arm64/syscalls/sched_getparam.S
-syscall_src += arch-arm64/syscalls/sched_getscheduler.S
-syscall_src += arch-arm64/syscalls/sched_rr_get_interval.S
-syscall_src += arch-arm64/syscalls/sched_setaffinity.S
-syscall_src += arch-arm64/syscalls/sched_setparam.S
-syscall_src += arch-arm64/syscalls/sched_setscheduler.S
-syscall_src += arch-arm64/syscalls/sched_yield.S
-syscall_src += arch-arm64/syscalls/sendfile.S
-syscall_src += arch-arm64/syscalls/sendmsg.S
-syscall_src += arch-arm64/syscalls/sendto.S
-syscall_src += arch-arm64/syscalls/setgid.S
-syscall_src += arch-arm64/syscalls/setgroups.S
-syscall_src += arch-arm64/syscalls/setitimer.S
-syscall_src += arch-arm64/syscalls/setns.S
-syscall_src += arch-arm64/syscalls/setpgid.S
-syscall_src += arch-arm64/syscalls/setpriority.S
-syscall_src += arch-arm64/syscalls/setregid.S
-syscall_src += arch-arm64/syscalls/setresgid.S
-syscall_src += arch-arm64/syscalls/setresuid.S
-syscall_src += arch-arm64/syscalls/setreuid.S
-syscall_src += arch-arm64/syscalls/setrlimit.S
-syscall_src += arch-arm64/syscalls/setsid.S
-syscall_src += arch-arm64/syscalls/setsockopt.S
-syscall_src += arch-arm64/syscalls/settimeofday.S
-syscall_src += arch-arm64/syscalls/setuid.S
-syscall_src += arch-arm64/syscalls/setxattr.S
-syscall_src += arch-arm64/syscalls/shutdown.S
-syscall_src += arch-arm64/syscalls/sigaltstack.S
-syscall_src += arch-arm64/syscalls/signalfd4.S
-syscall_src += arch-arm64/syscalls/socket.S
-syscall_src += arch-arm64/syscalls/socketpair.S
-syscall_src += arch-arm64/syscalls/statfs.S
-syscall_src += arch-arm64/syscalls/swapoff.S
-syscall_src += arch-arm64/syscalls/swapon.S
-syscall_src += arch-arm64/syscalls/symlinkat.S
-syscall_src += arch-arm64/syscalls/sync.S
-syscall_src += arch-arm64/syscalls/sysinfo.S
-syscall_src += arch-arm64/syscalls/tgkill.S
-syscall_src += arch-arm64/syscalls/timerfd_create.S
-syscall_src += arch-arm64/syscalls/timerfd_gettime.S
-syscall_src += arch-arm64/syscalls/timerfd_settime.S
-syscall_src += arch-arm64/syscalls/times.S
-syscall_src += arch-arm64/syscalls/tkill.S
-syscall_src += arch-arm64/syscalls/truncate.S
-syscall_src += arch-arm64/syscalls/umask.S
-syscall_src += arch-arm64/syscalls/umount2.S
-syscall_src += arch-arm64/syscalls/uname.S
-syscall_src += arch-arm64/syscalls/unlinkat.S
-syscall_src += arch-arm64/syscalls/unshare.S
-syscall_src += arch-arm64/syscalls/utimensat.S
-syscall_src += arch-arm64/syscalls/wait4.S
-syscall_src += arch-arm64/syscalls/write.S
-syscall_src += arch-arm64/syscalls/writev.S
diff --git a/libc/arch-mips/syscalls.mk b/libc/arch-mips/syscalls.mk
deleted file mode 100644
index a376c12..0000000
--- a/libc/arch-mips/syscalls.mk
+++ /dev/null
@@ -1,198 +0,0 @@
-# Generated by gensyscalls.py. Do not edit.
-syscall_src :=
-syscall_src += arch-mips/syscalls/__brk.S
-syscall_src += arch-mips/syscalls/__epoll_pwait.S
-syscall_src += arch-mips/syscalls/__exit.S
-syscall_src += arch-mips/syscalls/__fcntl64.S
-syscall_src += arch-mips/syscalls/__fstatfs64.S
-syscall_src += arch-mips/syscalls/__getcpu.S
-syscall_src += arch-mips/syscalls/__getcwd.S
-syscall_src += arch-mips/syscalls/__getpriority.S
-syscall_src += arch-mips/syscalls/__ioctl.S
-syscall_src += arch-mips/syscalls/__llseek.S
-syscall_src += arch-mips/syscalls/__mmap2.S
-syscall_src += arch-mips/syscalls/__openat.S
-syscall_src += arch-mips/syscalls/__ppoll.S
-syscall_src += arch-mips/syscalls/__pselect6.S
-syscall_src += arch-mips/syscalls/__ptrace.S
-syscall_src += arch-mips/syscalls/__reboot.S
-syscall_src += arch-mips/syscalls/__rt_sigaction.S
-syscall_src += arch-mips/syscalls/__rt_sigpending.S
-syscall_src += arch-mips/syscalls/__rt_sigprocmask.S
-syscall_src += arch-mips/syscalls/__rt_sigsuspend.S
-syscall_src += arch-mips/syscalls/__rt_sigtimedwait.S
-syscall_src += arch-mips/syscalls/__sched_getaffinity.S
-syscall_src += arch-mips/syscalls/__set_thread_area.S
-syscall_src += arch-mips/syscalls/__set_tid_address.S
-syscall_src += arch-mips/syscalls/__sigaction.S
-syscall_src += arch-mips/syscalls/__statfs64.S
-syscall_src += arch-mips/syscalls/__syslog.S
-syscall_src += arch-mips/syscalls/__timer_create.S
-syscall_src += arch-mips/syscalls/__timer_delete.S
-syscall_src += arch-mips/syscalls/__timer_getoverrun.S
-syscall_src += arch-mips/syscalls/__timer_gettime.S
-syscall_src += arch-mips/syscalls/__timer_settime.S
-syscall_src += arch-mips/syscalls/__waitid.S
-syscall_src += arch-mips/syscalls/_exit.S
-syscall_src += arch-mips/syscalls/_flush_cache.S
-syscall_src += arch-mips/syscalls/accept.S
-syscall_src += arch-mips/syscalls/acct.S
-syscall_src += arch-mips/syscalls/bind.S
-syscall_src += arch-mips/syscalls/capget.S
-syscall_src += arch-mips/syscalls/capset.S
-syscall_src += arch-mips/syscalls/chdir.S
-syscall_src += arch-mips/syscalls/chroot.S
-syscall_src += arch-mips/syscalls/clock_getres.S
-syscall_src += arch-mips/syscalls/clock_gettime.S
-syscall_src += arch-mips/syscalls/clock_nanosleep.S
-syscall_src += arch-mips/syscalls/clock_settime.S
-syscall_src += arch-mips/syscalls/close.S
-syscall_src += arch-mips/syscalls/connect.S
-syscall_src += arch-mips/syscalls/delete_module.S
-syscall_src += arch-mips/syscalls/dup.S
-syscall_src += arch-mips/syscalls/dup3.S
-syscall_src += arch-mips/syscalls/epoll_create1.S
-syscall_src += arch-mips/syscalls/epoll_ctl.S
-syscall_src += arch-mips/syscalls/eventfd.S
-syscall_src += arch-mips/syscalls/execve.S
-syscall_src += arch-mips/syscalls/faccessat.S
-syscall_src += arch-mips/syscalls/fallocate64.S
-syscall_src += arch-mips/syscalls/fchdir.S
-syscall_src += arch-mips/syscalls/fchmod.S
-syscall_src += arch-mips/syscalls/fchmodat.S
-syscall_src += arch-mips/syscalls/fchown.S
-syscall_src += arch-mips/syscalls/fchownat.S
-syscall_src += arch-mips/syscalls/fdatasync.S
-syscall_src += arch-mips/syscalls/fgetxattr.S
-syscall_src += arch-mips/syscalls/flistxattr.S
-syscall_src += arch-mips/syscalls/flock.S
-syscall_src += arch-mips/syscalls/fremovexattr.S
-syscall_src += arch-mips/syscalls/fsetxattr.S
-syscall_src += arch-mips/syscalls/fstat.S
-syscall_src += arch-mips/syscalls/fstatat.S
-syscall_src += arch-mips/syscalls/fsync.S
-syscall_src += arch-mips/syscalls/ftruncate.S
-syscall_src += arch-mips/syscalls/ftruncate64.S
-syscall_src += arch-mips/syscalls/futex.S
-syscall_src += arch-mips/syscalls/getdents.S
-syscall_src += arch-mips/syscalls/getegid.S
-syscall_src += arch-mips/syscalls/geteuid.S
-syscall_src += arch-mips/syscalls/getgid.S
-syscall_src += arch-mips/syscalls/getgroups.S
-syscall_src += arch-mips/syscalls/getitimer.S
-syscall_src += arch-mips/syscalls/getpeername.S
-syscall_src += arch-mips/syscalls/getpgid.S
-syscall_src += arch-mips/syscalls/getpid.S
-syscall_src += arch-mips/syscalls/getppid.S
-syscall_src += arch-mips/syscalls/getresgid.S
-syscall_src += arch-mips/syscalls/getresuid.S
-syscall_src += arch-mips/syscalls/getrlimit.S
-syscall_src += arch-mips/syscalls/getrusage.S
-syscall_src += arch-mips/syscalls/getsid.S
-syscall_src += arch-mips/syscalls/getsockname.S
-syscall_src += arch-mips/syscalls/getsockopt.S
-syscall_src += arch-mips/syscalls/gettid.S
-syscall_src += arch-mips/syscalls/gettimeofday.S
-syscall_src += arch-mips/syscalls/getuid.S
-syscall_src += arch-mips/syscalls/getxattr.S
-syscall_src += arch-mips/syscalls/init_module.S
-syscall_src += arch-mips/syscalls/inotify_add_watch.S
-syscall_src += arch-mips/syscalls/inotify_init1.S
-syscall_src += arch-mips/syscalls/inotify_rm_watch.S
-syscall_src += arch-mips/syscalls/ioprio_get.S
-syscall_src += arch-mips/syscalls/ioprio_set.S
-syscall_src += arch-mips/syscalls/kill.S
-syscall_src += arch-mips/syscalls/klogctl.S
-syscall_src += arch-mips/syscalls/lgetxattr.S
-syscall_src += arch-mips/syscalls/linkat.S
-syscall_src += arch-mips/syscalls/listen.S
-syscall_src += arch-mips/syscalls/listxattr.S
-syscall_src += arch-mips/syscalls/llistxattr.S
-syscall_src += arch-mips/syscalls/lremovexattr.S
-syscall_src += arch-mips/syscalls/lseek.S
-syscall_src += arch-mips/syscalls/lsetxattr.S
-syscall_src += arch-mips/syscalls/madvise.S
-syscall_src += arch-mips/syscalls/mincore.S
-syscall_src += arch-mips/syscalls/mkdirat.S
-syscall_src += arch-mips/syscalls/mknodat.S
-syscall_src += arch-mips/syscalls/mlock.S
-syscall_src += arch-mips/syscalls/mlockall.S
-syscall_src += arch-mips/syscalls/mount.S
-syscall_src += arch-mips/syscalls/mprotect.S
-syscall_src += arch-mips/syscalls/mremap.S
-syscall_src += arch-mips/syscalls/msync.S
-syscall_src += arch-mips/syscalls/munlock.S
-syscall_src += arch-mips/syscalls/munlockall.S
-syscall_src += arch-mips/syscalls/munmap.S
-syscall_src += arch-mips/syscalls/nanosleep.S
-syscall_src += arch-mips/syscalls/perf_event_open.S
-syscall_src += arch-mips/syscalls/personality.S
-syscall_src += arch-mips/syscalls/pipe2.S
-syscall_src += arch-mips/syscalls/prctl.S
-syscall_src += arch-mips/syscalls/pread64.S
-syscall_src += arch-mips/syscalls/prlimit64.S
-syscall_src += arch-mips/syscalls/pwrite64.S
-syscall_src += arch-mips/syscalls/read.S
-syscall_src += arch-mips/syscalls/readahead.S
-syscall_src += arch-mips/syscalls/readlinkat.S
-syscall_src += arch-mips/syscalls/readv.S
-syscall_src += arch-mips/syscalls/recvfrom.S
-syscall_src += arch-mips/syscalls/recvmsg.S
-syscall_src += arch-mips/syscalls/removexattr.S
-syscall_src += arch-mips/syscalls/renameat.S
-syscall_src += arch-mips/syscalls/sched_get_priority_max.S
-syscall_src += arch-mips/syscalls/sched_get_priority_min.S
-syscall_src += arch-mips/syscalls/sched_getparam.S
-syscall_src += arch-mips/syscalls/sched_getscheduler.S
-syscall_src += arch-mips/syscalls/sched_rr_get_interval.S
-syscall_src += arch-mips/syscalls/sched_setaffinity.S
-syscall_src += arch-mips/syscalls/sched_setparam.S
-syscall_src += arch-mips/syscalls/sched_setscheduler.S
-syscall_src += arch-mips/syscalls/sched_yield.S
-syscall_src += arch-mips/syscalls/sendfile.S
-syscall_src += arch-mips/syscalls/sendfile64.S
-syscall_src += arch-mips/syscalls/sendmsg.S
-syscall_src += arch-mips/syscalls/sendto.S
-syscall_src += arch-mips/syscalls/setgid.S
-syscall_src += arch-mips/syscalls/setgroups.S
-syscall_src += arch-mips/syscalls/setitimer.S
-syscall_src += arch-mips/syscalls/setns.S
-syscall_src += arch-mips/syscalls/setpgid.S
-syscall_src += arch-mips/syscalls/setpriority.S
-syscall_src += arch-mips/syscalls/setregid.S
-syscall_src += arch-mips/syscalls/setresgid.S
-syscall_src += arch-mips/syscalls/setresuid.S
-syscall_src += arch-mips/syscalls/setreuid.S
-syscall_src += arch-mips/syscalls/setrlimit.S
-syscall_src += arch-mips/syscalls/setsid.S
-syscall_src += arch-mips/syscalls/setsockopt.S
-syscall_src += arch-mips/syscalls/settimeofday.S
-syscall_src += arch-mips/syscalls/setuid.S
-syscall_src += arch-mips/syscalls/setxattr.S
-syscall_src += arch-mips/syscalls/shutdown.S
-syscall_src += arch-mips/syscalls/sigaltstack.S
-syscall_src += arch-mips/syscalls/signalfd4.S
-syscall_src += arch-mips/syscalls/socket.S
-syscall_src += arch-mips/syscalls/socketpair.S
-syscall_src += arch-mips/syscalls/swapoff.S
-syscall_src += arch-mips/syscalls/swapon.S
-syscall_src += arch-mips/syscalls/symlinkat.S
-syscall_src += arch-mips/syscalls/sync.S
-syscall_src += arch-mips/syscalls/sysinfo.S
-syscall_src += arch-mips/syscalls/tgkill.S
-syscall_src += arch-mips/syscalls/timerfd_create.S
-syscall_src += arch-mips/syscalls/timerfd_gettime.S
-syscall_src += arch-mips/syscalls/timerfd_settime.S
-syscall_src += arch-mips/syscalls/times.S
-syscall_src += arch-mips/syscalls/tkill.S
-syscall_src += arch-mips/syscalls/truncate.S
-syscall_src += arch-mips/syscalls/truncate64.S
-syscall_src += arch-mips/syscalls/umask.S
-syscall_src += arch-mips/syscalls/umount2.S
-syscall_src += arch-mips/syscalls/uname.S
-syscall_src += arch-mips/syscalls/unlinkat.S
-syscall_src += arch-mips/syscalls/unshare.S
-syscall_src += arch-mips/syscalls/utimensat.S
-syscall_src += arch-mips/syscalls/wait4.S
-syscall_src += arch-mips/syscalls/write.S
-syscall_src += arch-mips/syscalls/writev.S
diff --git a/libc/arch-mips64/syscalls.mk b/libc/arch-mips64/syscalls.mk
deleted file mode 100644
index 5d8029e..0000000
--- a/libc/arch-mips64/syscalls.mk
+++ /dev/null
@@ -1,194 +0,0 @@
-# Generated by gensyscalls.py. Do not edit.
-syscall_src :=
-syscall_src += arch-mips64/syscalls/__brk.S
-syscall_src += arch-mips64/syscalls/__epoll_pwait.S
-syscall_src += arch-mips64/syscalls/__exit.S
-syscall_src += arch-mips64/syscalls/__getcpu.S
-syscall_src += arch-mips64/syscalls/__getcwd.S
-syscall_src += arch-mips64/syscalls/__getdents.S
-syscall_src += arch-mips64/syscalls/__getdents64.S
-syscall_src += arch-mips64/syscalls/__getpriority.S
-syscall_src += arch-mips64/syscalls/__ioctl.S
-syscall_src += arch-mips64/syscalls/__openat.S
-syscall_src += arch-mips64/syscalls/__ppoll.S
-syscall_src += arch-mips64/syscalls/__pselect6.S
-syscall_src += arch-mips64/syscalls/__ptrace.S
-syscall_src += arch-mips64/syscalls/__reboot.S
-syscall_src += arch-mips64/syscalls/__rt_sigaction.S
-syscall_src += arch-mips64/syscalls/__rt_sigpending.S
-syscall_src += arch-mips64/syscalls/__rt_sigprocmask.S
-syscall_src += arch-mips64/syscalls/__rt_sigsuspend.S
-syscall_src += arch-mips64/syscalls/__rt_sigtimedwait.S
-syscall_src += arch-mips64/syscalls/__sched_getaffinity.S
-syscall_src += arch-mips64/syscalls/__set_thread_area.S
-syscall_src += arch-mips64/syscalls/__set_tid_address.S
-syscall_src += arch-mips64/syscalls/__syslog.S
-syscall_src += arch-mips64/syscalls/__timer_create.S
-syscall_src += arch-mips64/syscalls/__timer_delete.S
-syscall_src += arch-mips64/syscalls/__timer_getoverrun.S
-syscall_src += arch-mips64/syscalls/__timer_gettime.S
-syscall_src += arch-mips64/syscalls/__timer_settime.S
-syscall_src += arch-mips64/syscalls/__waitid.S
-syscall_src += arch-mips64/syscalls/_exit.S
-syscall_src += arch-mips64/syscalls/_flush_cache.S
-syscall_src += arch-mips64/syscalls/accept.S
-syscall_src += arch-mips64/syscalls/acct.S
-syscall_src += arch-mips64/syscalls/bind.S
-syscall_src += arch-mips64/syscalls/capget.S
-syscall_src += arch-mips64/syscalls/capset.S
-syscall_src += arch-mips64/syscalls/chdir.S
-syscall_src += arch-mips64/syscalls/chroot.S
-syscall_src += arch-mips64/syscalls/clock_getres.S
-syscall_src += arch-mips64/syscalls/clock_gettime.S
-syscall_src += arch-mips64/syscalls/clock_nanosleep.S
-syscall_src += arch-mips64/syscalls/clock_settime.S
-syscall_src += arch-mips64/syscalls/close.S
-syscall_src += arch-mips64/syscalls/connect.S
-syscall_src += arch-mips64/syscalls/delete_module.S
-syscall_src += arch-mips64/syscalls/dup.S
-syscall_src += arch-mips64/syscalls/dup3.S
-syscall_src += arch-mips64/syscalls/epoll_create1.S
-syscall_src += arch-mips64/syscalls/epoll_ctl.S
-syscall_src += arch-mips64/syscalls/eventfd.S
-syscall_src += arch-mips64/syscalls/execve.S
-syscall_src += arch-mips64/syscalls/faccessat.S
-syscall_src += arch-mips64/syscalls/fallocate.S
-syscall_src += arch-mips64/syscalls/fchdir.S
-syscall_src += arch-mips64/syscalls/fchmod.S
-syscall_src += arch-mips64/syscalls/fchmodat.S
-syscall_src += arch-mips64/syscalls/fchown.S
-syscall_src += arch-mips64/syscalls/fchownat.S
-syscall_src += arch-mips64/syscalls/fcntl.S
-syscall_src += arch-mips64/syscalls/fdatasync.S
-syscall_src += arch-mips64/syscalls/fgetxattr.S
-syscall_src += arch-mips64/syscalls/flistxattr.S
-syscall_src += arch-mips64/syscalls/flock.S
-syscall_src += arch-mips64/syscalls/fremovexattr.S
-syscall_src += arch-mips64/syscalls/fsetxattr.S
-syscall_src += arch-mips64/syscalls/fstat.S
-syscall_src += arch-mips64/syscalls/fstatat.S
-syscall_src += arch-mips64/syscalls/fstatfs.S
-syscall_src += arch-mips64/syscalls/fsync.S
-syscall_src += arch-mips64/syscalls/ftruncate.S
-syscall_src += arch-mips64/syscalls/futex.S
-syscall_src += arch-mips64/syscalls/getegid.S
-syscall_src += arch-mips64/syscalls/geteuid.S
-syscall_src += arch-mips64/syscalls/getgid.S
-syscall_src += arch-mips64/syscalls/getgroups.S
-syscall_src += arch-mips64/syscalls/getitimer.S
-syscall_src += arch-mips64/syscalls/getpeername.S
-syscall_src += arch-mips64/syscalls/getpgid.S
-syscall_src += arch-mips64/syscalls/getpid.S
-syscall_src += arch-mips64/syscalls/getppid.S
-syscall_src += arch-mips64/syscalls/getresgid.S
-syscall_src += arch-mips64/syscalls/getresuid.S
-syscall_src += arch-mips64/syscalls/getrlimit.S
-syscall_src += arch-mips64/syscalls/getrusage.S
-syscall_src += arch-mips64/syscalls/getsid.S
-syscall_src += arch-mips64/syscalls/getsockname.S
-syscall_src += arch-mips64/syscalls/getsockopt.S
-syscall_src += arch-mips64/syscalls/gettid.S
-syscall_src += arch-mips64/syscalls/gettimeofday.S
-syscall_src += arch-mips64/syscalls/getuid.S
-syscall_src += arch-mips64/syscalls/getxattr.S
-syscall_src += arch-mips64/syscalls/init_module.S
-syscall_src += arch-mips64/syscalls/inotify_add_watch.S
-syscall_src += arch-mips64/syscalls/inotify_init1.S
-syscall_src += arch-mips64/syscalls/inotify_rm_watch.S
-syscall_src += arch-mips64/syscalls/ioprio_get.S
-syscall_src += arch-mips64/syscalls/ioprio_set.S
-syscall_src += arch-mips64/syscalls/kill.S
-syscall_src += arch-mips64/syscalls/klogctl.S
-syscall_src += arch-mips64/syscalls/lgetxattr.S
-syscall_src += arch-mips64/syscalls/linkat.S
-syscall_src += arch-mips64/syscalls/listen.S
-syscall_src += arch-mips64/syscalls/listxattr.S
-syscall_src += arch-mips64/syscalls/llistxattr.S
-syscall_src += arch-mips64/syscalls/lremovexattr.S
-syscall_src += arch-mips64/syscalls/lseek.S
-syscall_src += arch-mips64/syscalls/lsetxattr.S
-syscall_src += arch-mips64/syscalls/madvise.S
-syscall_src += arch-mips64/syscalls/mincore.S
-syscall_src += arch-mips64/syscalls/mkdirat.S
-syscall_src += arch-mips64/syscalls/mknodat.S
-syscall_src += arch-mips64/syscalls/mlock.S
-syscall_src += arch-mips64/syscalls/mlockall.S
-syscall_src += arch-mips64/syscalls/mmap.S
-syscall_src += arch-mips64/syscalls/mount.S
-syscall_src += arch-mips64/syscalls/mprotect.S
-syscall_src += arch-mips64/syscalls/mremap.S
-syscall_src += arch-mips64/syscalls/msync.S
-syscall_src += arch-mips64/syscalls/munlock.S
-syscall_src += arch-mips64/syscalls/munlockall.S
-syscall_src += arch-mips64/syscalls/munmap.S
-syscall_src += arch-mips64/syscalls/nanosleep.S
-syscall_src += arch-mips64/syscalls/perf_event_open.S
-syscall_src += arch-mips64/syscalls/personality.S
-syscall_src += arch-mips64/syscalls/pipe2.S
-syscall_src += arch-mips64/syscalls/prctl.S
-syscall_src += arch-mips64/syscalls/pread64.S
-syscall_src += arch-mips64/syscalls/prlimit64.S
-syscall_src += arch-mips64/syscalls/pwrite64.S
-syscall_src += arch-mips64/syscalls/read.S
-syscall_src += arch-mips64/syscalls/readahead.S
-syscall_src += arch-mips64/syscalls/readlinkat.S
-syscall_src += arch-mips64/syscalls/readv.S
-syscall_src += arch-mips64/syscalls/recvfrom.S
-syscall_src += arch-mips64/syscalls/recvmsg.S
-syscall_src += arch-mips64/syscalls/removexattr.S
-syscall_src += arch-mips64/syscalls/renameat.S
-syscall_src += arch-mips64/syscalls/sched_get_priority_max.S
-syscall_src += arch-mips64/syscalls/sched_get_priority_min.S
-syscall_src += arch-mips64/syscalls/sched_getparam.S
-syscall_src += arch-mips64/syscalls/sched_getscheduler.S
-syscall_src += arch-mips64/syscalls/sched_rr_get_interval.S
-syscall_src += arch-mips64/syscalls/sched_setaffinity.S
-syscall_src += arch-mips64/syscalls/sched_setparam.S
-syscall_src += arch-mips64/syscalls/sched_setscheduler.S
-syscall_src += arch-mips64/syscalls/sched_yield.S
-syscall_src += arch-mips64/syscalls/sendfile.S
-syscall_src += arch-mips64/syscalls/sendmsg.S
-syscall_src += arch-mips64/syscalls/sendto.S
-syscall_src += arch-mips64/syscalls/setgid.S
-syscall_src += arch-mips64/syscalls/setgroups.S
-syscall_src += arch-mips64/syscalls/setitimer.S
-syscall_src += arch-mips64/syscalls/setns.S
-syscall_src += arch-mips64/syscalls/setpgid.S
-syscall_src += arch-mips64/syscalls/setpriority.S
-syscall_src += arch-mips64/syscalls/setregid.S
-syscall_src += arch-mips64/syscalls/setresgid.S
-syscall_src += arch-mips64/syscalls/setresuid.S
-syscall_src += arch-mips64/syscalls/setreuid.S
-syscall_src += arch-mips64/syscalls/setrlimit.S
-syscall_src += arch-mips64/syscalls/setsid.S
-syscall_src += arch-mips64/syscalls/setsockopt.S
-syscall_src += arch-mips64/syscalls/settimeofday.S
-syscall_src += arch-mips64/syscalls/setuid.S
-syscall_src += arch-mips64/syscalls/setxattr.S
-syscall_src += arch-mips64/syscalls/shutdown.S
-syscall_src += arch-mips64/syscalls/sigaltstack.S
-syscall_src += arch-mips64/syscalls/signalfd4.S
-syscall_src += arch-mips64/syscalls/socket.S
-syscall_src += arch-mips64/syscalls/socketpair.S
-syscall_src += arch-mips64/syscalls/statfs.S
-syscall_src += arch-mips64/syscalls/swapoff.S
-syscall_src += arch-mips64/syscalls/swapon.S
-syscall_src += arch-mips64/syscalls/symlinkat.S
-syscall_src += arch-mips64/syscalls/sync.S
-syscall_src += arch-mips64/syscalls/sysinfo.S
-syscall_src += arch-mips64/syscalls/tgkill.S
-syscall_src += arch-mips64/syscalls/timerfd_create.S
-syscall_src += arch-mips64/syscalls/timerfd_gettime.S
-syscall_src += arch-mips64/syscalls/timerfd_settime.S
-syscall_src += arch-mips64/syscalls/times.S
-syscall_src += arch-mips64/syscalls/tkill.S
-syscall_src += arch-mips64/syscalls/truncate.S
-syscall_src += arch-mips64/syscalls/umask.S
-syscall_src += arch-mips64/syscalls/umount2.S
-syscall_src += arch-mips64/syscalls/uname.S
-syscall_src += arch-mips64/syscalls/unlinkat.S
-syscall_src += arch-mips64/syscalls/unshare.S
-syscall_src += arch-mips64/syscalls/utimensat.S
-syscall_src += arch-mips64/syscalls/wait4.S
-syscall_src += arch-mips64/syscalls/write.S
-syscall_src += arch-mips64/syscalls/writev.S
diff --git a/libc/arch-x86/syscalls.mk b/libc/arch-x86/syscalls.mk
deleted file mode 100644
index 6d368b3..0000000
--- a/libc/arch-x86/syscalls.mk
+++ /dev/null
@@ -1,197 +0,0 @@
-# Generated by gensyscalls.py. Do not edit.
-syscall_src :=
-syscall_src += arch-x86/syscalls/__brk.S
-syscall_src += arch-x86/syscalls/__epoll_pwait.S
-syscall_src += arch-x86/syscalls/__exit.S
-syscall_src += arch-x86/syscalls/__fcntl64.S
-syscall_src += arch-x86/syscalls/__fstatfs64.S
-syscall_src += arch-x86/syscalls/__getcpu.S
-syscall_src += arch-x86/syscalls/__getcwd.S
-syscall_src += arch-x86/syscalls/__getpriority.S
-syscall_src += arch-x86/syscalls/__ioctl.S
-syscall_src += arch-x86/syscalls/__llseek.S
-syscall_src += arch-x86/syscalls/__mmap2.S
-syscall_src += arch-x86/syscalls/__openat.S
-syscall_src += arch-x86/syscalls/__ppoll.S
-syscall_src += arch-x86/syscalls/__pselect6.S
-syscall_src += arch-x86/syscalls/__ptrace.S
-syscall_src += arch-x86/syscalls/__reboot.S
-syscall_src += arch-x86/syscalls/__rt_sigaction.S
-syscall_src += arch-x86/syscalls/__rt_sigpending.S
-syscall_src += arch-x86/syscalls/__rt_sigprocmask.S
-syscall_src += arch-x86/syscalls/__rt_sigsuspend.S
-syscall_src += arch-x86/syscalls/__rt_sigtimedwait.S
-syscall_src += arch-x86/syscalls/__sched_getaffinity.S
-syscall_src += arch-x86/syscalls/__set_thread_area.S
-syscall_src += arch-x86/syscalls/__set_tid_address.S
-syscall_src += arch-x86/syscalls/__sigaction.S
-syscall_src += arch-x86/syscalls/__statfs64.S
-syscall_src += arch-x86/syscalls/__syslog.S
-syscall_src += arch-x86/syscalls/__timer_create.S
-syscall_src += arch-x86/syscalls/__timer_delete.S
-syscall_src += arch-x86/syscalls/__timer_getoverrun.S
-syscall_src += arch-x86/syscalls/__timer_gettime.S
-syscall_src += arch-x86/syscalls/__timer_settime.S
-syscall_src += arch-x86/syscalls/__waitid.S
-syscall_src += arch-x86/syscalls/_exit.S
-syscall_src += arch-x86/syscalls/accept.S
-syscall_src += arch-x86/syscalls/acct.S
-syscall_src += arch-x86/syscalls/bind.S
-syscall_src += arch-x86/syscalls/capget.S
-syscall_src += arch-x86/syscalls/capset.S
-syscall_src += arch-x86/syscalls/chdir.S
-syscall_src += arch-x86/syscalls/chroot.S
-syscall_src += arch-x86/syscalls/clock_getres.S
-syscall_src += arch-x86/syscalls/clock_gettime.S
-syscall_src += arch-x86/syscalls/clock_nanosleep.S
-syscall_src += arch-x86/syscalls/clock_settime.S
-syscall_src += arch-x86/syscalls/close.S
-syscall_src += arch-x86/syscalls/connect.S
-syscall_src += arch-x86/syscalls/delete_module.S
-syscall_src += arch-x86/syscalls/dup.S
-syscall_src += arch-x86/syscalls/dup3.S
-syscall_src += arch-x86/syscalls/epoll_create1.S
-syscall_src += arch-x86/syscalls/epoll_ctl.S
-syscall_src += arch-x86/syscalls/eventfd.S
-syscall_src += arch-x86/syscalls/execve.S
-syscall_src += arch-x86/syscalls/faccessat.S
-syscall_src += arch-x86/syscalls/fallocate64.S
-syscall_src += arch-x86/syscalls/fchdir.S
-syscall_src += arch-x86/syscalls/fchmod.S
-syscall_src += arch-x86/syscalls/fchmodat.S
-syscall_src += arch-x86/syscalls/fchown.S
-syscall_src += arch-x86/syscalls/fchownat.S
-syscall_src += arch-x86/syscalls/fdatasync.S
-syscall_src += arch-x86/syscalls/fgetxattr.S
-syscall_src += arch-x86/syscalls/flistxattr.S
-syscall_src += arch-x86/syscalls/flock.S
-syscall_src += arch-x86/syscalls/fremovexattr.S
-syscall_src += arch-x86/syscalls/fsetxattr.S
-syscall_src += arch-x86/syscalls/fstat.S
-syscall_src += arch-x86/syscalls/fstatat.S
-syscall_src += arch-x86/syscalls/fsync.S
-syscall_src += arch-x86/syscalls/ftruncate.S
-syscall_src += arch-x86/syscalls/ftruncate64.S
-syscall_src += arch-x86/syscalls/futex.S
-syscall_src += arch-x86/syscalls/getdents.S
-syscall_src += arch-x86/syscalls/getegid.S
-syscall_src += arch-x86/syscalls/geteuid.S
-syscall_src += arch-x86/syscalls/getgid.S
-syscall_src += arch-x86/syscalls/getgroups.S
-syscall_src += arch-x86/syscalls/getitimer.S
-syscall_src += arch-x86/syscalls/getpeername.S
-syscall_src += arch-x86/syscalls/getpgid.S
-syscall_src += arch-x86/syscalls/getpid.S
-syscall_src += arch-x86/syscalls/getppid.S
-syscall_src += arch-x86/syscalls/getresgid.S
-syscall_src += arch-x86/syscalls/getresuid.S
-syscall_src += arch-x86/syscalls/getrlimit.S
-syscall_src += arch-x86/syscalls/getrusage.S
-syscall_src += arch-x86/syscalls/getsid.S
-syscall_src += arch-x86/syscalls/getsockname.S
-syscall_src += arch-x86/syscalls/getsockopt.S
-syscall_src += arch-x86/syscalls/gettid.S
-syscall_src += arch-x86/syscalls/gettimeofday.S
-syscall_src += arch-x86/syscalls/getuid.S
-syscall_src += arch-x86/syscalls/getxattr.S
-syscall_src += arch-x86/syscalls/init_module.S
-syscall_src += arch-x86/syscalls/inotify_add_watch.S
-syscall_src += arch-x86/syscalls/inotify_init1.S
-syscall_src += arch-x86/syscalls/inotify_rm_watch.S
-syscall_src += arch-x86/syscalls/ioprio_get.S
-syscall_src += arch-x86/syscalls/ioprio_set.S
-syscall_src += arch-x86/syscalls/kill.S
-syscall_src += arch-x86/syscalls/klogctl.S
-syscall_src += arch-x86/syscalls/lgetxattr.S
-syscall_src += arch-x86/syscalls/linkat.S
-syscall_src += arch-x86/syscalls/listen.S
-syscall_src += arch-x86/syscalls/listxattr.S
-syscall_src += arch-x86/syscalls/llistxattr.S
-syscall_src += arch-x86/syscalls/lremovexattr.S
-syscall_src += arch-x86/syscalls/lseek.S
-syscall_src += arch-x86/syscalls/lsetxattr.S
-syscall_src += arch-x86/syscalls/madvise.S
-syscall_src += arch-x86/syscalls/mincore.S
-syscall_src += arch-x86/syscalls/mkdirat.S
-syscall_src += arch-x86/syscalls/mknodat.S
-syscall_src += arch-x86/syscalls/mlock.S
-syscall_src += arch-x86/syscalls/mlockall.S
-syscall_src += arch-x86/syscalls/mount.S
-syscall_src += arch-x86/syscalls/mprotect.S
-syscall_src += arch-x86/syscalls/mremap.S
-syscall_src += arch-x86/syscalls/msync.S
-syscall_src += arch-x86/syscalls/munlock.S
-syscall_src += arch-x86/syscalls/munlockall.S
-syscall_src += arch-x86/syscalls/munmap.S
-syscall_src += arch-x86/syscalls/nanosleep.S
-syscall_src += arch-x86/syscalls/perf_event_open.S
-syscall_src += arch-x86/syscalls/personality.S
-syscall_src += arch-x86/syscalls/pipe2.S
-syscall_src += arch-x86/syscalls/prctl.S
-syscall_src += arch-x86/syscalls/pread64.S
-syscall_src += arch-x86/syscalls/prlimit64.S
-syscall_src += arch-x86/syscalls/pwrite64.S
-syscall_src += arch-x86/syscalls/read.S
-syscall_src += arch-x86/syscalls/readahead.S
-syscall_src += arch-x86/syscalls/readlinkat.S
-syscall_src += arch-x86/syscalls/readv.S
-syscall_src += arch-x86/syscalls/recvfrom.S
-syscall_src += arch-x86/syscalls/recvmsg.S
-syscall_src += arch-x86/syscalls/removexattr.S
-syscall_src += arch-x86/syscalls/renameat.S
-syscall_src += arch-x86/syscalls/sched_get_priority_max.S
-syscall_src += arch-x86/syscalls/sched_get_priority_min.S
-syscall_src += arch-x86/syscalls/sched_getparam.S
-syscall_src += arch-x86/syscalls/sched_getscheduler.S
-syscall_src += arch-x86/syscalls/sched_rr_get_interval.S
-syscall_src += arch-x86/syscalls/sched_setaffinity.S
-syscall_src += arch-x86/syscalls/sched_setparam.S
-syscall_src += arch-x86/syscalls/sched_setscheduler.S
-syscall_src += arch-x86/syscalls/sched_yield.S
-syscall_src += arch-x86/syscalls/sendfile.S
-syscall_src += arch-x86/syscalls/sendfile64.S
-syscall_src += arch-x86/syscalls/sendmsg.S
-syscall_src += arch-x86/syscalls/sendto.S
-syscall_src += arch-x86/syscalls/setgid.S
-syscall_src += arch-x86/syscalls/setgroups.S
-syscall_src += arch-x86/syscalls/setitimer.S
-syscall_src += arch-x86/syscalls/setns.S
-syscall_src += arch-x86/syscalls/setpgid.S
-syscall_src += arch-x86/syscalls/setpriority.S
-syscall_src += arch-x86/syscalls/setregid.S
-syscall_src += arch-x86/syscalls/setresgid.S
-syscall_src += arch-x86/syscalls/setresuid.S
-syscall_src += arch-x86/syscalls/setreuid.S
-syscall_src += arch-x86/syscalls/setrlimit.S
-syscall_src += arch-x86/syscalls/setsid.S
-syscall_src += arch-x86/syscalls/setsockopt.S
-syscall_src += arch-x86/syscalls/settimeofday.S
-syscall_src += arch-x86/syscalls/setuid.S
-syscall_src += arch-x86/syscalls/setxattr.S
-syscall_src += arch-x86/syscalls/shutdown.S
-syscall_src += arch-x86/syscalls/sigaltstack.S
-syscall_src += arch-x86/syscalls/signalfd4.S
-syscall_src += arch-x86/syscalls/socket.S
-syscall_src += arch-x86/syscalls/socketpair.S
-syscall_src += arch-x86/syscalls/swapoff.S
-syscall_src += arch-x86/syscalls/swapon.S
-syscall_src += arch-x86/syscalls/symlinkat.S
-syscall_src += arch-x86/syscalls/sync.S
-syscall_src += arch-x86/syscalls/sysinfo.S
-syscall_src += arch-x86/syscalls/tgkill.S
-syscall_src += arch-x86/syscalls/timerfd_create.S
-syscall_src += arch-x86/syscalls/timerfd_gettime.S
-syscall_src += arch-x86/syscalls/timerfd_settime.S
-syscall_src += arch-x86/syscalls/times.S
-syscall_src += arch-x86/syscalls/tkill.S
-syscall_src += arch-x86/syscalls/truncate.S
-syscall_src += arch-x86/syscalls/truncate64.S
-syscall_src += arch-x86/syscalls/umask.S
-syscall_src += arch-x86/syscalls/umount2.S
-syscall_src += arch-x86/syscalls/uname.S
-syscall_src += arch-x86/syscalls/unlinkat.S
-syscall_src += arch-x86/syscalls/unshare.S
-syscall_src += arch-x86/syscalls/utimensat.S
-syscall_src += arch-x86/syscalls/wait4.S
-syscall_src += arch-x86/syscalls/write.S
-syscall_src += arch-x86/syscalls/writev.S
diff --git a/libc/arch-x86_64/syscalls.mk b/libc/arch-x86_64/syscalls.mk
deleted file mode 100644
index 13d921a..0000000
--- a/libc/arch-x86_64/syscalls.mk
+++ /dev/null
@@ -1,192 +0,0 @@
-# Generated by gensyscalls.py. Do not edit.
-syscall_src :=
-syscall_src += arch-x86_64/syscalls/__arch_prctl.S
-syscall_src += arch-x86_64/syscalls/__brk.S
-syscall_src += arch-x86_64/syscalls/__epoll_pwait.S
-syscall_src += arch-x86_64/syscalls/__exit.S
-syscall_src += arch-x86_64/syscalls/__getcpu.S
-syscall_src += arch-x86_64/syscalls/__getcwd.S
-syscall_src += arch-x86_64/syscalls/__getpriority.S
-syscall_src += arch-x86_64/syscalls/__ioctl.S
-syscall_src += arch-x86_64/syscalls/__openat.S
-syscall_src += arch-x86_64/syscalls/__ppoll.S
-syscall_src += arch-x86_64/syscalls/__pselect6.S
-syscall_src += arch-x86_64/syscalls/__ptrace.S
-syscall_src += arch-x86_64/syscalls/__reboot.S
-syscall_src += arch-x86_64/syscalls/__rt_sigaction.S
-syscall_src += arch-x86_64/syscalls/__rt_sigpending.S
-syscall_src += arch-x86_64/syscalls/__rt_sigprocmask.S
-syscall_src += arch-x86_64/syscalls/__rt_sigsuspend.S
-syscall_src += arch-x86_64/syscalls/__rt_sigtimedwait.S
-syscall_src += arch-x86_64/syscalls/__sched_getaffinity.S
-syscall_src += arch-x86_64/syscalls/__set_tid_address.S
-syscall_src += arch-x86_64/syscalls/__syslog.S
-syscall_src += arch-x86_64/syscalls/__timer_create.S
-syscall_src += arch-x86_64/syscalls/__timer_delete.S
-syscall_src += arch-x86_64/syscalls/__timer_getoverrun.S
-syscall_src += arch-x86_64/syscalls/__timer_gettime.S
-syscall_src += arch-x86_64/syscalls/__timer_settime.S
-syscall_src += arch-x86_64/syscalls/__waitid.S
-syscall_src += arch-x86_64/syscalls/_exit.S
-syscall_src += arch-x86_64/syscalls/accept.S
-syscall_src += arch-x86_64/syscalls/acct.S
-syscall_src += arch-x86_64/syscalls/bind.S
-syscall_src += arch-x86_64/syscalls/capget.S
-syscall_src += arch-x86_64/syscalls/capset.S
-syscall_src += arch-x86_64/syscalls/chdir.S
-syscall_src += arch-x86_64/syscalls/chroot.S
-syscall_src += arch-x86_64/syscalls/clock_getres.S
-syscall_src += arch-x86_64/syscalls/clock_gettime.S
-syscall_src += arch-x86_64/syscalls/clock_nanosleep.S
-syscall_src += arch-x86_64/syscalls/clock_settime.S
-syscall_src += arch-x86_64/syscalls/close.S
-syscall_src += arch-x86_64/syscalls/connect.S
-syscall_src += arch-x86_64/syscalls/delete_module.S
-syscall_src += arch-x86_64/syscalls/dup.S
-syscall_src += arch-x86_64/syscalls/dup3.S
-syscall_src += arch-x86_64/syscalls/epoll_create1.S
-syscall_src += arch-x86_64/syscalls/epoll_ctl.S
-syscall_src += arch-x86_64/syscalls/eventfd.S
-syscall_src += arch-x86_64/syscalls/execve.S
-syscall_src += arch-x86_64/syscalls/faccessat.S
-syscall_src += arch-x86_64/syscalls/fallocate.S
-syscall_src += arch-x86_64/syscalls/fchdir.S
-syscall_src += arch-x86_64/syscalls/fchmod.S
-syscall_src += arch-x86_64/syscalls/fchmodat.S
-syscall_src += arch-x86_64/syscalls/fchown.S
-syscall_src += arch-x86_64/syscalls/fchownat.S
-syscall_src += arch-x86_64/syscalls/fcntl.S
-syscall_src += arch-x86_64/syscalls/fdatasync.S
-syscall_src += arch-x86_64/syscalls/fgetxattr.S
-syscall_src += arch-x86_64/syscalls/flistxattr.S
-syscall_src += arch-x86_64/syscalls/flock.S
-syscall_src += arch-x86_64/syscalls/fremovexattr.S
-syscall_src += arch-x86_64/syscalls/fsetxattr.S
-syscall_src += arch-x86_64/syscalls/fstat.S
-syscall_src += arch-x86_64/syscalls/fstatat.S
-syscall_src += arch-x86_64/syscalls/fstatfs.S
-syscall_src += arch-x86_64/syscalls/fsync.S
-syscall_src += arch-x86_64/syscalls/ftruncate.S
-syscall_src += arch-x86_64/syscalls/futex.S
-syscall_src += arch-x86_64/syscalls/getdents.S
-syscall_src += arch-x86_64/syscalls/getegid.S
-syscall_src += arch-x86_64/syscalls/geteuid.S
-syscall_src += arch-x86_64/syscalls/getgid.S
-syscall_src += arch-x86_64/syscalls/getgroups.S
-syscall_src += arch-x86_64/syscalls/getitimer.S
-syscall_src += arch-x86_64/syscalls/getpeername.S
-syscall_src += arch-x86_64/syscalls/getpgid.S
-syscall_src += arch-x86_64/syscalls/getpid.S
-syscall_src += arch-x86_64/syscalls/getppid.S
-syscall_src += arch-x86_64/syscalls/getresgid.S
-syscall_src += arch-x86_64/syscalls/getresuid.S
-syscall_src += arch-x86_64/syscalls/getrlimit.S
-syscall_src += arch-x86_64/syscalls/getrusage.S
-syscall_src += arch-x86_64/syscalls/getsid.S
-syscall_src += arch-x86_64/syscalls/getsockname.S
-syscall_src += arch-x86_64/syscalls/getsockopt.S
-syscall_src += arch-x86_64/syscalls/gettid.S
-syscall_src += arch-x86_64/syscalls/gettimeofday.S
-syscall_src += arch-x86_64/syscalls/getuid.S
-syscall_src += arch-x86_64/syscalls/getxattr.S
-syscall_src += arch-x86_64/syscalls/init_module.S
-syscall_src += arch-x86_64/syscalls/inotify_add_watch.S
-syscall_src += arch-x86_64/syscalls/inotify_init1.S
-syscall_src += arch-x86_64/syscalls/inotify_rm_watch.S
-syscall_src += arch-x86_64/syscalls/ioprio_get.S
-syscall_src += arch-x86_64/syscalls/ioprio_set.S
-syscall_src += arch-x86_64/syscalls/kill.S
-syscall_src += arch-x86_64/syscalls/klogctl.S
-syscall_src += arch-x86_64/syscalls/lgetxattr.S
-syscall_src += arch-x86_64/syscalls/linkat.S
-syscall_src += arch-x86_64/syscalls/listen.S
-syscall_src += arch-x86_64/syscalls/listxattr.S
-syscall_src += arch-x86_64/syscalls/llistxattr.S
-syscall_src += arch-x86_64/syscalls/lremovexattr.S
-syscall_src += arch-x86_64/syscalls/lseek.S
-syscall_src += arch-x86_64/syscalls/lsetxattr.S
-syscall_src += arch-x86_64/syscalls/madvise.S
-syscall_src += arch-x86_64/syscalls/mincore.S
-syscall_src += arch-x86_64/syscalls/mkdirat.S
-syscall_src += arch-x86_64/syscalls/mknodat.S
-syscall_src += arch-x86_64/syscalls/mlock.S
-syscall_src += arch-x86_64/syscalls/mlockall.S
-syscall_src += arch-x86_64/syscalls/mmap.S
-syscall_src += arch-x86_64/syscalls/mount.S
-syscall_src += arch-x86_64/syscalls/mprotect.S
-syscall_src += arch-x86_64/syscalls/mremap.S
-syscall_src += arch-x86_64/syscalls/msync.S
-syscall_src += arch-x86_64/syscalls/munlock.S
-syscall_src += arch-x86_64/syscalls/munlockall.S
-syscall_src += arch-x86_64/syscalls/munmap.S
-syscall_src += arch-x86_64/syscalls/nanosleep.S
-syscall_src += arch-x86_64/syscalls/perf_event_open.S
-syscall_src += arch-x86_64/syscalls/personality.S
-syscall_src += arch-x86_64/syscalls/pipe2.S
-syscall_src += arch-x86_64/syscalls/prctl.S
-syscall_src += arch-x86_64/syscalls/pread64.S
-syscall_src += arch-x86_64/syscalls/prlimit64.S
-syscall_src += arch-x86_64/syscalls/pwrite64.S
-syscall_src += arch-x86_64/syscalls/read.S
-syscall_src += arch-x86_64/syscalls/readahead.S
-syscall_src += arch-x86_64/syscalls/readlinkat.S
-syscall_src += arch-x86_64/syscalls/readv.S
-syscall_src += arch-x86_64/syscalls/recvfrom.S
-syscall_src += arch-x86_64/syscalls/recvmsg.S
-syscall_src += arch-x86_64/syscalls/removexattr.S
-syscall_src += arch-x86_64/syscalls/renameat.S
-syscall_src += arch-x86_64/syscalls/sched_get_priority_max.S
-syscall_src += arch-x86_64/syscalls/sched_get_priority_min.S
-syscall_src += arch-x86_64/syscalls/sched_getparam.S
-syscall_src += arch-x86_64/syscalls/sched_getscheduler.S
-syscall_src += arch-x86_64/syscalls/sched_rr_get_interval.S
-syscall_src += arch-x86_64/syscalls/sched_setaffinity.S
-syscall_src += arch-x86_64/syscalls/sched_setparam.S
-syscall_src += arch-x86_64/syscalls/sched_setscheduler.S
-syscall_src += arch-x86_64/syscalls/sched_yield.S
-syscall_src += arch-x86_64/syscalls/sendfile.S
-syscall_src += arch-x86_64/syscalls/sendmsg.S
-syscall_src += arch-x86_64/syscalls/sendto.S
-syscall_src += arch-x86_64/syscalls/setgid.S
-syscall_src += arch-x86_64/syscalls/setgroups.S
-syscall_src += arch-x86_64/syscalls/setitimer.S
-syscall_src += arch-x86_64/syscalls/setns.S
-syscall_src += arch-x86_64/syscalls/setpgid.S
-syscall_src += arch-x86_64/syscalls/setpriority.S
-syscall_src += arch-x86_64/syscalls/setregid.S
-syscall_src += arch-x86_64/syscalls/setresgid.S
-syscall_src += arch-x86_64/syscalls/setresuid.S
-syscall_src += arch-x86_64/syscalls/setreuid.S
-syscall_src += arch-x86_64/syscalls/setrlimit.S
-syscall_src += arch-x86_64/syscalls/setsid.S
-syscall_src += arch-x86_64/syscalls/setsockopt.S
-syscall_src += arch-x86_64/syscalls/settimeofday.S
-syscall_src += arch-x86_64/syscalls/setuid.S
-syscall_src += arch-x86_64/syscalls/setxattr.S
-syscall_src += arch-x86_64/syscalls/shutdown.S
-syscall_src += arch-x86_64/syscalls/sigaltstack.S
-syscall_src += arch-x86_64/syscalls/signalfd4.S
-syscall_src += arch-x86_64/syscalls/socket.S
-syscall_src += arch-x86_64/syscalls/socketpair.S
-syscall_src += arch-x86_64/syscalls/statfs.S
-syscall_src += arch-x86_64/syscalls/swapoff.S
-syscall_src += arch-x86_64/syscalls/swapon.S
-syscall_src += arch-x86_64/syscalls/symlinkat.S
-syscall_src += arch-x86_64/syscalls/sync.S
-syscall_src += arch-x86_64/syscalls/sysinfo.S
-syscall_src += arch-x86_64/syscalls/tgkill.S
-syscall_src += arch-x86_64/syscalls/timerfd_create.S
-syscall_src += arch-x86_64/syscalls/timerfd_gettime.S
-syscall_src += arch-x86_64/syscalls/timerfd_settime.S
-syscall_src += arch-x86_64/syscalls/times.S
-syscall_src += arch-x86_64/syscalls/tkill.S
-syscall_src += arch-x86_64/syscalls/truncate.S
-syscall_src += arch-x86_64/syscalls/umask.S
-syscall_src += arch-x86_64/syscalls/umount2.S
-syscall_src += arch-x86_64/syscalls/uname.S
-syscall_src += arch-x86_64/syscalls/unlinkat.S
-syscall_src += arch-x86_64/syscalls/unshare.S
-syscall_src += arch-x86_64/syscalls/utimensat.S
-syscall_src += arch-x86_64/syscalls/wait4.S
-syscall_src += arch-x86_64/syscalls/write.S
-syscall_src += arch-x86_64/syscalls/writev.S
diff --git a/libc/tools/gensyscalls.py b/libc/tools/gensyscalls.py
index 54b8dbc..30590cd 100755
--- a/libc/tools/gensyscalls.py
+++ b/libc/tools/gensyscalls.py
@@ -483,20 +483,6 @@
         self.other_files.append(glibc_syscalls_h_path)
 
 
-    # Write the contents of syscalls.mk.
-    def gen_arch_syscalls_mk(self, arch):
-        path = "arch-%s/syscalls.mk" % arch
-        D("generating " + path)
-        fp = create_file(path)
-        fp.write("# %s\n" % warning)
-        fp.write("syscall_src :=\n")
-        for syscall in sorted(self.syscalls, key=lambda syscall: syscall["func"]):
-            if syscall.has_key("asm-%s" % arch):
-                fp.write("syscall_src += arch-%s/syscalls/%s.S\n" % (arch, syscall["func"]))
-        fp.close()
-        self.other_files.append(path)
-
-
     # Write each syscall stub.
     def gen_syscall_stubs(self):
         for syscall in self.syscalls:
@@ -531,8 +517,6 @@
         D("re-generating stubs and support files...")
 
         self.gen_glibc_syscalls_h()
-        for arch in all_arches:
-            self.gen_arch_syscalls_mk(arch)
         self.gen_syscall_stubs()
 
         D("comparing files...")