diff --git a/libc/Android.mk b/libc/Android.mk
index 1164bd6..ea46bf9 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -446,6 +446,40 @@
 
 endif # arm
 
+ifeq ($(TARGET_ARCH), arm64)
+#TODO: Replace C stubs with optimised assembly
+libc_common_src_files += \
+    bionic/memchr.c   \
+    bionic/memcmp.c   \
+    bionic/memcpy.c   \
+    bionic/memmove.c  \
+    bionic/memrchr.c  \
+    bionic/memset.c   \
+    bionic/strchr.cpp \
+    bionic/strnlen.c  \
+    string/bcopy.c    \
+    string/index.c    \
+    string/memcmp16.c \
+    string/strcat.c   \
+    string/strcmp.c   \
+    string/strcpy.c   \
+    string/strlcat.c  \
+    string/strlcpy.c  \
+    string/strlen.c   \
+    string/strncat.c  \
+    string/strncmp.c  \
+    string/strncpy.c  \
+    string/strrchr.c  \
+    upstream-freebsd/lib/libc/string/wcscat.c \
+    upstream-freebsd/lib/libc/string/wcschr.c \
+    upstream-freebsd/lib/libc/string/wcscmp.c \
+    upstream-freebsd/lib/libc/string/wcscpy.c \
+    upstream-freebsd/lib/libc/string/wcslen.c \
+    upstream-freebsd/lib/libc/string/wcsrchr.c \
+    upstream-freebsd/lib/libc/string/wmemcmp.c \
+
+endif # arm64
+
 ifeq ($(TARGET_ARCH),mips)
 libc_common_src_files += \
     bionic/memchr.c \
@@ -506,40 +540,6 @@
 
 endif # x86_64
 
-ifeq ($(TARGET_ARCH), aarch64)
-#TODO: Replace C stubs with optimised assembly
-libc_common_src_files += \
-    bionic/memchr.c   \
-    bionic/memcmp.c   \
-    bionic/memcpy.c   \
-    bionic/memmove.c  \
-    bionic/memrchr.c  \
-    bionic/memset.c   \
-    bionic/strchr.cpp \
-    bionic/strnlen.c  \
-    string/bcopy.c    \
-    string/index.c    \
-    string/memcmp16.c \
-    string/strcat.c   \
-    string/strcmp.c   \
-    string/strcpy.c   \
-    string/strlcat.c  \
-    string/strlcpy.c  \
-    string/strlen.c   \
-    string/strncat.c  \
-    string/strncmp.c  \
-    string/strncpy.c  \
-    string/strrchr.c  \
-    upstream-freebsd/lib/libc/string/wcscat.c \
-    upstream-freebsd/lib/libc/string/wcschr.c \
-    upstream-freebsd/lib/libc/string/wcscmp.c \
-    upstream-freebsd/lib/libc/string/wcscpy.c \
-    upstream-freebsd/lib/libc/string/wcslen.c \
-    upstream-freebsd/lib/libc/string/wcsrchr.c \
-    upstream-freebsd/lib/libc/string/wmemcmp.c \
-
-endif # aarch64
-
 ifeq ($(TARGET_ARCH),arm)
   ifeq ($(strip $(TARGET_CPU_VARIANT)),)
     $(warning TARGET_ARCH is arm, but TARGET_CPU_VARIANT is not defined)
@@ -662,7 +662,7 @@
 # which are needed to build all other objects (shared/static libs and
 # executables)
 # ==========================================================================
-# AArch64, ARM, MIPS, and x86 all need crtbegin_so/crtend_so.
+# ARM, Arm64, MIPS, and x86 all need crtbegin_so/crtend_so.
 #
 # For x86, the .init section must point to a function that calls all
 # entries in the .ctors section. (on ARM this is done through the
@@ -675,13 +675,13 @@
 libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-common/bionic/crtbegin.c
 libc_crt_target_crtbegin_so_file := $(LOCAL_PATH)/arch-common/bionic/crtbegin_so.c
 
-ifeq ($(TARGET_ARCH),aarch64)
-    libc_crt_target_so_cflags :=
-    libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.c
-endif
 ifeq ($(TARGET_ARCH),arm)
     libc_crt_target_so_cflags :=
 endif
+ifeq ($(TARGET_ARCH),arm64)
+    libc_crt_target_so_cflags :=
+    libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.c
+endif
 ifeq ($(TARGET_ARCH),mips)
     libc_crt_target_so_cflags := -fPIC
     libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.c
diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT
index 6e10daa..0951648 100644
--- a/libc/SYSCALLS.TXT
+++ b/libc/SYSCALLS.TXT
@@ -6,7 +6,7 @@
 #
 # where:
 #       arch_list ::= "all" | arch+
-#       arch      ::= "aarch64" | "arm" | "mips" | "x86" | "x86_64"
+#       arch      ::= "arm" | "arm64" | "mips" | "x86" | "x86_64"
 #
 # Note:
 #      - syscall_name corresponds to the name of the syscall, which may differ from
@@ -27,35 +27,35 @@
 int     execve(const char*, char* const*, char* const*)  all
 
 uid_t   getuid:getuid32()         arm,x86
-uid_t   getuid:getuid()           aarch64,mips,x86_64
+uid_t   getuid:getuid()           arm64,mips,x86_64
 gid_t   getgid:getgid32()         arm,x86
-gid_t   getgid:getgid()           aarch64,mips,x86_64
+gid_t   getgid:getgid()           arm64,mips,x86_64
 uid_t   geteuid:geteuid32()       arm,x86
-uid_t   geteuid:geteuid()         aarch64,mips,x86_64
+uid_t   geteuid:geteuid()         arm64,mips,x86_64
 gid_t   getegid:getegid32()       arm,x86
-gid_t   getegid:getegid()         aarch64,mips,x86_64
+gid_t   getegid:getegid()         arm64,mips,x86_64
 uid_t   getresuid:getresuid32(uid_t* ruid, uid_t* euid, uid_t* suid)   arm,x86
-uid_t   getresuid:getresuid(uid_t* ruid, uid_t* euid, uid_t* suid)     aarch64,mips,x86_64
+uid_t   getresuid:getresuid(uid_t* ruid, uid_t* euid, uid_t* suid)     arm64,mips,x86_64
 gid_t   getresgid:getresgid32(gid_t* rgid, gid_t* egid, gid_t* sgid)   arm,x86
-gid_t   getresgid:getresgid(gid_t* rgid, gid_t* egid, gid_t* sgid)     aarch64,mips,x86_64
+gid_t   getresgid:getresgid(gid_t* rgid, gid_t* egid, gid_t* sgid)     arm64,mips,x86_64
 pid_t   gettid()                   all
 ssize_t readahead(int, off64_t, size_t)     all
 int     getgroups:getgroups32(int, gid_t*)    arm,x86
-int     getgroups:getgroups(int, gid_t*)      aarch64,mips,x86_64
+int     getgroups:getgroups(int, gid_t*)      arm64,mips,x86_64
 pid_t   getpgid(pid_t)             all
 pid_t   getppid()                  all
 pid_t   getsid(pid_t)              all
 pid_t   setsid()                   all
 int     setgid:setgid32(gid_t)     arm,x86
-int     setgid:setgid(gid_t)       aarch64,mips,x86_64
+int     setgid:setgid(gid_t)       arm64,mips,x86_64
 int     setuid:setuid32(uid_t)    arm,x86
-int     setuid:setuid(uid_t)      aarch64,mips,x86_64
+int     setuid:setuid(uid_t)      arm64,mips,x86_64
 int     setreuid:setreuid32(uid_t, uid_t)   arm,x86
-int     setreuid:setreuid(uid_t, uid_t)     aarch64,mips,x86_64
+int     setreuid:setreuid(uid_t, uid_t)     arm64,mips,x86_64
 int     setresuid:setresuid32(uid_t, uid_t, uid_t)   arm,x86
-int     setresuid:setresuid(uid_t, uid_t, uid_t)     aarch64,mips,x86_64
+int     setresuid:setresuid(uid_t, uid_t, uid_t)     arm64,mips,x86_64
 int     setresgid:setresgid32(gid_t, gid_t, gid_t)   arm,x86
-int     setresgid:setresgid(gid_t, gid_t, gid_t)     aarch64,mips,x86_64
+int     setresgid:setresgid(gid_t, gid_t, gid_t)     arm64,mips,x86_64
 void*   __brk:brk(void*)           all
 int     kill(pid_t, int)           all
 int     tkill(pid_t tid, int sig)  all
@@ -71,18 +71,18 @@
 # On 32-bit systems we use prlimit64 to implement the rlimit64 functions.
 int getrlimit:ugetrlimit(int, struct rlimit*)  arm,x86
 int getrlimit(int, struct rlimit*)  mips
-int getrlimit|getrlimit64(int, struct rlimit*)  aarch64,x86_64
+int getrlimit|getrlimit64(int, struct rlimit*)  arm64,x86_64
 int setrlimit(int, const struct rlimit*)  arm,mips,x86
-int setrlimit|setrlimit64(int, const struct rlimit*)  aarch64,x86_64
-int prlimit64|prlimit(pid_t, int, struct rlimit64*, const struct rlimit64*)  aarch64,x86_64
+int setrlimit|setrlimit64(int, const struct rlimit*)  arm64,x86_64
+int prlimit64|prlimit(pid_t, int, struct rlimit64*, const struct rlimit64*)  arm64,x86_64
 int prlimit64(pid_t, int, struct rlimit64*, const struct rlimit64*)  arm,mips,x86
 
 int     setgroups:setgroups32(int, const gid_t*)   arm,x86
-int     setgroups:setgroups(int, const gid_t*)     aarch64,mips,x86_64
+int     setgroups:setgroups(int, const gid_t*)     arm64,mips,x86_64
 int     setpgid(pid_t, pid_t)  all
 pid_t   vfork(void)  arm
 int     setregid:setregid32(gid_t, gid_t)  arm,x86
-int     setregid:setregid(gid_t, gid_t)    aarch64,mips,x86_64
+int     setregid:setregid(gid_t, gid_t)    arm64,mips,x86_64
 int     chroot(const char*)  all
 # IMPORTANT: Even though <sys/prctl.h> declares prctl(int, ...), the syscall stub must take 6 arguments
 #            to match the kernel implementation.
@@ -97,9 +97,9 @@
 ssize_t     read(int, void*, size_t)        all
 ssize_t     write(int, const void*, size_t)       all
 ssize_t     pread64(int, void*, size_t, off64_t) arm,mips,x86
-ssize_t     pread64|pread(int, void*, size_t, off_t) aarch64,x86_64
+ssize_t     pread64|pread(int, void*, size_t, off_t) arm64,x86_64
 ssize_t     pwrite64(int, void*, size_t, off64_t) arm,mips,x86
-ssize_t     pwrite64|pwrite(int, void*, size_t, off_t) aarch64,x86_64
+ssize_t     pwrite64|pwrite(int, void*, size_t, off_t) arm64,x86_64
 int         close(int)                      all
 pid_t       getpid()    all
 int         munmap(void*, size_t)  all
@@ -116,7 +116,7 @@
 int         readv(int, const struct iovec*, int)   all
 int         writev(int, const struct iovec*, int)  all
 int         __fcntl64:fcntl64(int, int, void*)  arm,mips,x86
-int         fcntl(int, int, void*)  aarch64,x86_64
+int         fcntl(int, int, void*)  arm64,x86_64
 int         flock(int, int)   all
 int         fchmod(int, mode_t)  all
 int         dup(int)  all
@@ -126,10 +126,10 @@
 int         fsync(int)  all
 int         fdatasync(int) all
 int         fchown:fchown32(int, uid_t, gid_t)  arm,x86
-int         fchown:fchown(int, uid_t, gid_t)    aarch64,mips,x86_64
+int         fchown:fchown(int, uid_t, gid_t)    arm64,mips,x86_64
 void        sync(void)  all
 int         __fstatfs64:fstatfs64(int, size_t, struct statfs*)  arm,mips,x86
-int         fstatfs(int, struct statfs*)  aarch64,x86_64
+int         fstatfs(int, struct statfs*)  arm64,x86_64
 int         fsetxattr(int, const char*, const void*, size_t, int) all
 ssize_t     fgetxattr(int, const char*, void*, size_t) all
 ssize_t     flistxattr(int, char*, size_t) all
@@ -140,7 +140,7 @@
 int fchmodat(int, const char*, mode_t, int)  all
 int fchownat(int, const char*, uid_t, gid_t, int)  all
 int fstatat:fstatat64(int, const char*, struct stat*, int)   arm,mips,x86
-int fstatat:newfstatat(int, const char*, struct stat*, int)  aarch64,x86_64
+int fstatat:newfstatat(int, const char*, struct stat*, int)  arm64,x86_64
 int linkat(int, const char*, int, const char*, int)  all
 int mkdirat(int, const char*, mode_t)  all
 int mknodat(int, const char*, mode_t, dev_t)  all
@@ -156,26 +156,26 @@
 # That means that every system call in this section should take three lines.
 off_t lseek(int, off_t, int) arm,mips,x86
 int __llseek:_llseek(int, unsigned long, unsigned long, off64_t*, int) arm,mips,x86
-off_t lseek|lseek64(int, off_t, int) aarch64,x86_64
+off_t lseek|lseek64(int, off_t, int) arm64,x86_64
 int ftruncate(int, off_t) arm,mips,x86
 int ftruncate64(int, off64_t) arm,mips,x86
-int ftruncate|ftruncate64(int, off_t) aarch64,x86_64
+int ftruncate|ftruncate64(int, off_t) arm64,x86_64
 ssize_t sendfile(int out_fd, int in_fd, off_t* offset, size_t count) arm,mips,x86
 ssize_t sendfile64(int out_fd, int in_fd, off64_t* offset, size_t count) arm,mips,x86
-ssize_t sendfile|sendfile64(int out_fd, int in_fd, off_t* offset, size_t count) aarch64,x86_64
+ssize_t sendfile|sendfile64(int out_fd, int in_fd, off_t* offset, size_t count) arm64,x86_64
 int truncate(const char*, off_t) arm,mips,x86
 int truncate64(const char*, off64_t) arm,mips,x86
-int truncate|truncate64(const char*, off_t) aarch64,x86_64
+int truncate|truncate64(const char*, off_t) arm64,x86_64
 # (mmap only gets two lines because we only used the 64-bit variant on 32-bit systems.)
 void* __mmap2:mmap2(void*, size_t, int, int, int, long)   arm,mips,x86
-void* mmap|mmap64(void*, size_t, int, int, int, off_t)  aarch64,x86_64
+void* mmap|mmap64(void*, size_t, int, int, int, off_t)  arm64,x86_64
 
 # file system
 int     chdir(const char*)              all
 int     mount(const char*, const char*, const char*, unsigned long, const void*)  all
 int     umount2(const char*, int)  all
 int     fstat:fstat64(int, struct stat*)    arm,mips,x86
-int     fstat(int, struct stat*)    aarch64,x86_64
+int     fstat(int, struct stat*)    arm64,x86_64
 int     __getcwd:getcwd(char* buf, size_t size)  all
 int     fchdir(int)    all
 int     setxattr(const char*, const char*, const void*, size_t, int) all
@@ -187,7 +187,7 @@
 int     removexattr(const char*, const char*) all
 int     lremovexattr(const char*, const char*) all
 int     __statfs64:statfs64(const char*, size_t, struct statfs*)  arm,mips,x86
-int     statfs(const char*, struct statfs*)  aarch64,x86_64
+int     statfs(const char*, struct statfs*)  arm64,x86_64
 int     swapon(const char*, int) all
 int     swapoff(const char*) all
 
@@ -221,21 +221,21 @@
 int     signalfd4(int, const sigset_t*, size_t, int)  all
 
 # sockets
-int           socket(int, int, int)              aarch64,arm,mips,x86_64
-int           socketpair(int, int, int, int*)    aarch64,arm,mips,x86_64
-int           bind(int, struct sockaddr*, int)  aarch64,arm,mips,x86_64
-int           connect(int, struct sockaddr*, socklen_t)   aarch64,arm,mips,x86_64
-int           listen(int, int)                   aarch64,arm,mips,x86_64
-int           accept(int, struct sockaddr*, socklen_t*)  aarch64,arm,mips,x86_64
-int           getsockname(int, struct sockaddr*, socklen_t*)  aarch64,arm,mips,x86_64
-int           getpeername(int, struct sockaddr*, socklen_t*)  aarch64,arm,mips,x86_64
-int           sendto(int, const void*, size_t, int, const struct sockaddr*, socklen_t)  aarch64,arm,mips,x86_64
-int           recvfrom(int, void*, size_t, unsigned int, struct sockaddr*, socklen_t*)  aarch64,arm,mips,x86_64
-int           shutdown(int, int)  aarch64,arm,mips,x86_64
-int           setsockopt(int, int, int, const void*, socklen_t)  aarch64,arm,mips,x86_64
-int           getsockopt(int, int, int, void*, socklen_t*)    aarch64,arm,mips,x86_64
-int           sendmsg(int, const struct msghdr*, unsigned int)  aarch64,arm,mips,x86_64
-int           recvmsg(int, struct msghdr*, unsigned int)   aarch64,arm,mips,x86_64
+int           socket(int, int, int)              arm,arm64,mips,x86_64
+int           socketpair(int, int, int, int*)    arm,arm64,mips,x86_64
+int           bind(int, struct sockaddr*, int)  arm,arm64,mips,x86_64
+int           connect(int, struct sockaddr*, socklen_t)   arm,arm64,mips,x86_64
+int           listen(int, int)                   arm,arm64,mips,x86_64
+int           accept(int, struct sockaddr*, socklen_t*)  arm,arm64,mips,x86_64
+int           getsockname(int, struct sockaddr*, socklen_t*)  arm,arm64,mips,x86_64
+int           getpeername(int, struct sockaddr*, socklen_t*)  arm,arm64,mips,x86_64
+int           sendto(int, const void*, size_t, int, const struct sockaddr*, socklen_t)  arm,arm64,mips,x86_64
+int           recvfrom(int, void*, size_t, unsigned int, struct sockaddr*, socklen_t*)  arm,arm64,mips,x86_64
+int           shutdown(int, int)  arm,arm64,mips,x86_64
+int           setsockopt(int, int, int, const void*, socklen_t)  arm,arm64,mips,x86_64
+int           getsockopt(int, int, int, void*, socklen_t*)    arm,arm64,mips,x86_64
+int           sendmsg(int, const struct msghdr*, unsigned int)  arm,arm64,mips,x86_64
+int           recvmsg(int, struct msghdr*, unsigned int)   arm,arm64,mips,x86_64
 
 # sockets for x86. These are done as an "indexed" call to socketcall syscall.
 int           socket:socketcall:1(int, int, int) x86
diff --git a/libc/arch-aarch64/aarch64.mk b/libc/arch-aarch64/aarch64.mk
deleted file mode 100644
index 643cf69..0000000
--- a/libc/arch-aarch64/aarch64.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-_LIBC_ARCH_COMMON_SRC_FILES := \
-    arch-aarch64/bionic/__bionic_clone.S \
-    arch-aarch64/bionic/bzero_aarch64.c \
-    arch-aarch64/bionic/cacheflush_aarch64.c \
-    arch-aarch64/bionic/_exit_with_stack_teardown.S \
-    arch-aarch64/bionic/futex_aarch64.S \
-    arch-aarch64/bionic/__get_sp.S \
-    arch-aarch64/bionic/__rt_sigreturn.S \
-    arch-aarch64/bionic/_setjmp.S \
-    arch-aarch64/bionic/setjmp.S \
-    arch-aarch64/bionic/__set_tls.c \
-    arch-aarch64/bionic/sigsetjmp.S \
-    arch-aarch64/bionic/syscall.S \
-    arch-aarch64/bionic/vfork.S \
-
-_LIBC_ARCH_STATIC_SRC_FILES := \
-    bionic/dl_iterate_phdr_static.c \
-
-_LIBC_ARCH_DYNAMIC_SRC_FILES :=
diff --git a/libc/arch-aarch64/syscalls.mk b/libc/arch-aarch64/syscalls.mk
deleted file mode 100644
index 653ef70..0000000
--- a/libc/arch-aarch64/syscalls.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# Generated by gensyscalls.py. Do not edit.
-syscall_src :=
-syscall_src += arch-aarch64/syscalls/__brk.S
-syscall_src += arch-aarch64/syscalls/__epoll_pwait.S
-syscall_src += arch-aarch64/syscalls/__exit.S
-syscall_src += arch-aarch64/syscalls/__getcpu.S
-syscall_src += arch-aarch64/syscalls/__getcwd.S
-syscall_src += arch-aarch64/syscalls/__getpriority.S
-syscall_src += arch-aarch64/syscalls/__ioctl.S
-syscall_src += arch-aarch64/syscalls/__openat.S
-syscall_src += arch-aarch64/syscalls/__ppoll.S
-syscall_src += arch-aarch64/syscalls/__pselect6.S
-syscall_src += arch-aarch64/syscalls/__ptrace.S
-syscall_src += arch-aarch64/syscalls/__reboot.S
-syscall_src += arch-aarch64/syscalls/__rt_sigaction.S
-syscall_src += arch-aarch64/syscalls/__rt_sigpending.S
-syscall_src += arch-aarch64/syscalls/__rt_sigprocmask.S
-syscall_src += arch-aarch64/syscalls/__rt_sigsuspend.S
-syscall_src += arch-aarch64/syscalls/__rt_sigtimedwait.S
-syscall_src += arch-aarch64/syscalls/__sched_getaffinity.S
-syscall_src += arch-aarch64/syscalls/__set_tid_address.S
-syscall_src += arch-aarch64/syscalls/__syslog.S
-syscall_src += arch-aarch64/syscalls/__timer_create.S
-syscall_src += arch-aarch64/syscalls/__timer_delete.S
-syscall_src += arch-aarch64/syscalls/__timer_getoverrun.S
-syscall_src += arch-aarch64/syscalls/__timer_gettime.S
-syscall_src += arch-aarch64/syscalls/__timer_settime.S
-syscall_src += arch-aarch64/syscalls/__waitid.S
-syscall_src += arch-aarch64/syscalls/_exit.S
-syscall_src += arch-aarch64/syscalls/accept.S
-syscall_src += arch-aarch64/syscalls/acct.S
-syscall_src += arch-aarch64/syscalls/bind.S
-syscall_src += arch-aarch64/syscalls/capget.S
-syscall_src += arch-aarch64/syscalls/capset.S
-syscall_src += arch-aarch64/syscalls/chdir.S
-syscall_src += arch-aarch64/syscalls/chroot.S
-syscall_src += arch-aarch64/syscalls/clock_getres.S
-syscall_src += arch-aarch64/syscalls/clock_gettime.S
-syscall_src += arch-aarch64/syscalls/clock_nanosleep.S
-syscall_src += arch-aarch64/syscalls/clock_settime.S
-syscall_src += arch-aarch64/syscalls/close.S
-syscall_src += arch-aarch64/syscalls/connect.S
-syscall_src += arch-aarch64/syscalls/delete_module.S
-syscall_src += arch-aarch64/syscalls/dup.S
-syscall_src += arch-aarch64/syscalls/dup3.S
-syscall_src += arch-aarch64/syscalls/epoll_create1.S
-syscall_src += arch-aarch64/syscalls/epoll_ctl.S
-syscall_src += arch-aarch64/syscalls/eventfd.S
-syscall_src += arch-aarch64/syscalls/execve.S
-syscall_src += arch-aarch64/syscalls/faccessat.S
-syscall_src += arch-aarch64/syscalls/fchdir.S
-syscall_src += arch-aarch64/syscalls/fchmod.S
-syscall_src += arch-aarch64/syscalls/fchmodat.S
-syscall_src += arch-aarch64/syscalls/fchown.S
-syscall_src += arch-aarch64/syscalls/fchownat.S
-syscall_src += arch-aarch64/syscalls/fcntl.S
-syscall_src += arch-aarch64/syscalls/fdatasync.S
-syscall_src += arch-aarch64/syscalls/fgetxattr.S
-syscall_src += arch-aarch64/syscalls/flistxattr.S
-syscall_src += arch-aarch64/syscalls/flock.S
-syscall_src += arch-aarch64/syscalls/fremovexattr.S
-syscall_src += arch-aarch64/syscalls/fsetxattr.S
-syscall_src += arch-aarch64/syscalls/fstat.S
-syscall_src += arch-aarch64/syscalls/fstatat.S
-syscall_src += arch-aarch64/syscalls/fstatfs.S
-syscall_src += arch-aarch64/syscalls/fsync.S
-syscall_src += arch-aarch64/syscalls/ftruncate.S
-syscall_src += arch-aarch64/syscalls/futex.S
-syscall_src += arch-aarch64/syscalls/getdents.S
-syscall_src += arch-aarch64/syscalls/getegid.S
-syscall_src += arch-aarch64/syscalls/geteuid.S
-syscall_src += arch-aarch64/syscalls/getgid.S
-syscall_src += arch-aarch64/syscalls/getgroups.S
-syscall_src += arch-aarch64/syscalls/getitimer.S
-syscall_src += arch-aarch64/syscalls/getpeername.S
-syscall_src += arch-aarch64/syscalls/getpgid.S
-syscall_src += arch-aarch64/syscalls/getpid.S
-syscall_src += arch-aarch64/syscalls/getppid.S
-syscall_src += arch-aarch64/syscalls/getresgid.S
-syscall_src += arch-aarch64/syscalls/getresuid.S
-syscall_src += arch-aarch64/syscalls/getrlimit.S
-syscall_src += arch-aarch64/syscalls/getrusage.S
-syscall_src += arch-aarch64/syscalls/getsid.S
-syscall_src += arch-aarch64/syscalls/getsockname.S
-syscall_src += arch-aarch64/syscalls/getsockopt.S
-syscall_src += arch-aarch64/syscalls/gettid.S
-syscall_src += arch-aarch64/syscalls/gettimeofday.S
-syscall_src += arch-aarch64/syscalls/getuid.S
-syscall_src += arch-aarch64/syscalls/getxattr.S
-syscall_src += arch-aarch64/syscalls/init_module.S
-syscall_src += arch-aarch64/syscalls/inotify_add_watch.S
-syscall_src += arch-aarch64/syscalls/inotify_init1.S
-syscall_src += arch-aarch64/syscalls/inotify_rm_watch.S
-syscall_src += arch-aarch64/syscalls/ioprio_get.S
-syscall_src += arch-aarch64/syscalls/ioprio_set.S
-syscall_src += arch-aarch64/syscalls/kill.S
-syscall_src += arch-aarch64/syscalls/klogctl.S
-syscall_src += arch-aarch64/syscalls/lgetxattr.S
-syscall_src += arch-aarch64/syscalls/linkat.S
-syscall_src += arch-aarch64/syscalls/listen.S
-syscall_src += arch-aarch64/syscalls/listxattr.S
-syscall_src += arch-aarch64/syscalls/llistxattr.S
-syscall_src += arch-aarch64/syscalls/lremovexattr.S
-syscall_src += arch-aarch64/syscalls/lseek.S
-syscall_src += arch-aarch64/syscalls/lsetxattr.S
-syscall_src += arch-aarch64/syscalls/madvise.S
-syscall_src += arch-aarch64/syscalls/mincore.S
-syscall_src += arch-aarch64/syscalls/mkdirat.S
-syscall_src += arch-aarch64/syscalls/mknodat.S
-syscall_src += arch-aarch64/syscalls/mlock.S
-syscall_src += arch-aarch64/syscalls/mlockall.S
-syscall_src += arch-aarch64/syscalls/mmap.S
-syscall_src += arch-aarch64/syscalls/mount.S
-syscall_src += arch-aarch64/syscalls/mprotect.S
-syscall_src += arch-aarch64/syscalls/mremap.S
-syscall_src += arch-aarch64/syscalls/msync.S
-syscall_src += arch-aarch64/syscalls/munlock.S
-syscall_src += arch-aarch64/syscalls/munlockall.S
-syscall_src += arch-aarch64/syscalls/munmap.S
-syscall_src += arch-aarch64/syscalls/nanosleep.S
-syscall_src += arch-aarch64/syscalls/perf_event_open.S
-syscall_src += arch-aarch64/syscalls/personality.S
-syscall_src += arch-aarch64/syscalls/pipe2.S
-syscall_src += arch-aarch64/syscalls/prctl.S
-syscall_src += arch-aarch64/syscalls/pread64.S
-syscall_src += arch-aarch64/syscalls/prlimit64.S
-syscall_src += arch-aarch64/syscalls/pwrite64.S
-syscall_src += arch-aarch64/syscalls/read.S
-syscall_src += arch-aarch64/syscalls/readahead.S
-syscall_src += arch-aarch64/syscalls/readlinkat.S
-syscall_src += arch-aarch64/syscalls/readv.S
-syscall_src += arch-aarch64/syscalls/recvfrom.S
-syscall_src += arch-aarch64/syscalls/recvmsg.S
-syscall_src += arch-aarch64/syscalls/removexattr.S
-syscall_src += arch-aarch64/syscalls/renameat.S
-syscall_src += arch-aarch64/syscalls/sched_get_priority_max.S
-syscall_src += arch-aarch64/syscalls/sched_get_priority_min.S
-syscall_src += arch-aarch64/syscalls/sched_getparam.S
-syscall_src += arch-aarch64/syscalls/sched_getscheduler.S
-syscall_src += arch-aarch64/syscalls/sched_rr_get_interval.S
-syscall_src += arch-aarch64/syscalls/sched_setaffinity.S
-syscall_src += arch-aarch64/syscalls/sched_setparam.S
-syscall_src += arch-aarch64/syscalls/sched_setscheduler.S
-syscall_src += arch-aarch64/syscalls/sched_yield.S
-syscall_src += arch-aarch64/syscalls/sendfile.S
-syscall_src += arch-aarch64/syscalls/sendmsg.S
-syscall_src += arch-aarch64/syscalls/sendto.S
-syscall_src += arch-aarch64/syscalls/setgid.S
-syscall_src += arch-aarch64/syscalls/setgroups.S
-syscall_src += arch-aarch64/syscalls/setitimer.S
-syscall_src += arch-aarch64/syscalls/setns.S
-syscall_src += arch-aarch64/syscalls/setpgid.S
-syscall_src += arch-aarch64/syscalls/setpriority.S
-syscall_src += arch-aarch64/syscalls/setregid.S
-syscall_src += arch-aarch64/syscalls/setresgid.S
-syscall_src += arch-aarch64/syscalls/setresuid.S
-syscall_src += arch-aarch64/syscalls/setreuid.S
-syscall_src += arch-aarch64/syscalls/setrlimit.S
-syscall_src += arch-aarch64/syscalls/setsid.S
-syscall_src += arch-aarch64/syscalls/setsockopt.S
-syscall_src += arch-aarch64/syscalls/settimeofday.S
-syscall_src += arch-aarch64/syscalls/setuid.S
-syscall_src += arch-aarch64/syscalls/setxattr.S
-syscall_src += arch-aarch64/syscalls/shutdown.S
-syscall_src += arch-aarch64/syscalls/sigaltstack.S
-syscall_src += arch-aarch64/syscalls/signalfd4.S
-syscall_src += arch-aarch64/syscalls/socket.S
-syscall_src += arch-aarch64/syscalls/socketpair.S
-syscall_src += arch-aarch64/syscalls/statfs.S
-syscall_src += arch-aarch64/syscalls/swapoff.S
-syscall_src += arch-aarch64/syscalls/swapon.S
-syscall_src += arch-aarch64/syscalls/symlinkat.S
-syscall_src += arch-aarch64/syscalls/sync.S
-syscall_src += arch-aarch64/syscalls/sysinfo.S
-syscall_src += arch-aarch64/syscalls/tgkill.S
-syscall_src += arch-aarch64/syscalls/timerfd_create.S
-syscall_src += arch-aarch64/syscalls/timerfd_gettime.S
-syscall_src += arch-aarch64/syscalls/timerfd_settime.S
-syscall_src += arch-aarch64/syscalls/times.S
-syscall_src += arch-aarch64/syscalls/tkill.S
-syscall_src += arch-aarch64/syscalls/truncate.S
-syscall_src += arch-aarch64/syscalls/umask.S
-syscall_src += arch-aarch64/syscalls/umount2.S
-syscall_src += arch-aarch64/syscalls/uname.S
-syscall_src += arch-aarch64/syscalls/unlinkat.S
-syscall_src += arch-aarch64/syscalls/unshare.S
-syscall_src += arch-aarch64/syscalls/utimensat.S
-syscall_src += arch-aarch64/syscalls/wait4.S
-syscall_src += arch-aarch64/syscalls/write.S
-syscall_src += arch-aarch64/syscalls/writev.S
diff --git a/libc/arch-arm64/arm64.mk b/libc/arch-arm64/arm64.mk
new file mode 100644
index 0000000..86bf91a
--- /dev/null
+++ b/libc/arch-arm64/arm64.mk
@@ -0,0 +1,19 @@
+_LIBC_ARCH_COMMON_SRC_FILES := \
+    arch-arm64/bionic/__bionic_clone.S \
+    arch-arm64/bionic/bzero_arm64.c \
+    arch-arm64/bionic/cacheflush_arm64.c \
+    arch-arm64/bionic/_exit_with_stack_teardown.S \
+    arch-arm64/bionic/futex_arm64.S \
+    arch-arm64/bionic/__get_sp.S \
+    arch-arm64/bionic/__rt_sigreturn.S \
+    arch-arm64/bionic/_setjmp.S \
+    arch-arm64/bionic/setjmp.S \
+    arch-arm64/bionic/__set_tls.c \
+    arch-arm64/bionic/sigsetjmp.S \
+    arch-arm64/bionic/syscall.S \
+    arch-arm64/bionic/vfork.S \
+
+_LIBC_ARCH_STATIC_SRC_FILES := \
+    bionic/dl_iterate_phdr_static.c \
+
+_LIBC_ARCH_DYNAMIC_SRC_FILES :=
diff --git a/libc/arch-aarch64/bionic/__bionic_clone.S b/libc/arch-arm64/bionic/__bionic_clone.S
similarity index 100%
rename from libc/arch-aarch64/bionic/__bionic_clone.S
rename to libc/arch-arm64/bionic/__bionic_clone.S
diff --git a/libc/arch-aarch64/bionic/__get_sp.S b/libc/arch-arm64/bionic/__get_sp.S
similarity index 100%
rename from libc/arch-aarch64/bionic/__get_sp.S
rename to libc/arch-arm64/bionic/__get_sp.S
diff --git a/libc/arch-aarch64/bionic/__rt_sigreturn.S b/libc/arch-arm64/bionic/__rt_sigreturn.S
similarity index 100%
rename from libc/arch-aarch64/bionic/__rt_sigreturn.S
rename to libc/arch-arm64/bionic/__rt_sigreturn.S
diff --git a/libc/arch-aarch64/bionic/__set_tls.c b/libc/arch-arm64/bionic/__set_tls.c
similarity index 100%
rename from libc/arch-aarch64/bionic/__set_tls.c
rename to libc/arch-arm64/bionic/__set_tls.c
diff --git a/libc/arch-aarch64/bionic/_exit_with_stack_teardown.S b/libc/arch-arm64/bionic/_exit_with_stack_teardown.S
similarity index 100%
rename from libc/arch-aarch64/bionic/_exit_with_stack_teardown.S
rename to libc/arch-arm64/bionic/_exit_with_stack_teardown.S
diff --git a/libc/arch-aarch64/bionic/_setjmp.S b/libc/arch-arm64/bionic/_setjmp.S
similarity index 100%
rename from libc/arch-aarch64/bionic/_setjmp.S
rename to libc/arch-arm64/bionic/_setjmp.S
diff --git a/libc/arch-aarch64/bionic/bzero_aarch64.c b/libc/arch-arm64/bionic/bzero_arm64.c
similarity index 100%
rename from libc/arch-aarch64/bionic/bzero_aarch64.c
rename to libc/arch-arm64/bionic/bzero_arm64.c
diff --git a/libc/arch-aarch64/bionic/cacheflush_aarch64.c b/libc/arch-arm64/bionic/cacheflush_arm64.c
similarity index 100%
rename from libc/arch-aarch64/bionic/cacheflush_aarch64.c
rename to libc/arch-arm64/bionic/cacheflush_arm64.c
diff --git a/libc/arch-aarch64/bionic/crtbegin.c b/libc/arch-arm64/bionic/crtbegin.c
similarity index 93%
rename from libc/arch-aarch64/bionic/crtbegin.c
rename to libc/arch-arm64/bionic/crtbegin.c
index 73d2010..fec0b11 100644
--- a/libc/arch-aarch64/bionic/crtbegin.c
+++ b/libc/arch-arm64/bionic/crtbegin.c
@@ -40,7 +40,7 @@
 void (*__FINI_ARRAY__)(void) = (void (*)(void)) -1;
 
 
-__LIBC_HIDDEN__ void do_aarch64_start(void* raw_args) {
+__LIBC_HIDDEN__ void do_arm64_start(void* raw_args) {
   structors_array_t array;
   array.preinit_array = &__PREINIT_ARRAY__;
   array.init_array = &__INIT_ARRAY__;
@@ -49,7 +49,7 @@
 }
 
 /*
- * Put the value of sp in x0 and call do_aarch64_init(). The latter will then
+ * Put the value of sp in x0 and call do_arm64_init(). The latter will then
  * then be able to access the stack as prepared by the kernel's execve system
  * call (via the first argument).
  */
@@ -61,7 +61,7 @@
 "        .type   _start, %function  \n"
 "_start:                            \n"
 "        add     x0, sp, xzr        \n"
-"        b       do_aarch64_start   \n"
+"        b       do_arm64_start   \n"
 "        .size   _start, .-_start   \n"
 );
 
diff --git a/libc/arch-aarch64/bionic/futex_aarch64.S b/libc/arch-arm64/bionic/futex_arm64.S
similarity index 100%
rename from libc/arch-aarch64/bionic/futex_aarch64.S
rename to libc/arch-arm64/bionic/futex_arm64.S
diff --git a/libc/arch-aarch64/bionic/setjmp.S b/libc/arch-arm64/bionic/setjmp.S
similarity index 100%
rename from libc/arch-aarch64/bionic/setjmp.S
rename to libc/arch-arm64/bionic/setjmp.S
diff --git a/libc/arch-aarch64/bionic/sigsetjmp.S b/libc/arch-arm64/bionic/sigsetjmp.S
similarity index 100%
rename from libc/arch-aarch64/bionic/sigsetjmp.S
rename to libc/arch-arm64/bionic/sigsetjmp.S
diff --git a/libc/arch-aarch64/bionic/syscall.S b/libc/arch-arm64/bionic/syscall.S
similarity index 100%
rename from libc/arch-aarch64/bionic/syscall.S
rename to libc/arch-arm64/bionic/syscall.S
diff --git a/libc/arch-aarch64/bionic/vfork.S b/libc/arch-arm64/bionic/vfork.S
similarity index 100%
rename from libc/arch-aarch64/bionic/vfork.S
rename to libc/arch-arm64/bionic/vfork.S
diff --git a/libc/arch-aarch64/include/machine/_types.h b/libc/arch-arm64/include/machine/_types.h
similarity index 100%
rename from libc/arch-aarch64/include/machine/_types.h
rename to libc/arch-arm64/include/machine/_types.h
diff --git a/libc/arch-aarch64/include/machine/asm.h b/libc/arch-arm64/include/machine/asm.h
similarity index 100%
rename from libc/arch-aarch64/include/machine/asm.h
rename to libc/arch-arm64/include/machine/asm.h
diff --git a/libc/arch-aarch64/include/machine/elf_machdep.h b/libc/arch-arm64/include/machine/elf_machdep.h
similarity index 100%
rename from libc/arch-aarch64/include/machine/elf_machdep.h
rename to libc/arch-arm64/include/machine/elf_machdep.h
diff --git a/libc/arch-aarch64/include/machine/endian.h b/libc/arch-arm64/include/machine/endian.h
similarity index 100%
rename from libc/arch-aarch64/include/machine/endian.h
rename to libc/arch-arm64/include/machine/endian.h
diff --git a/libc/arch-aarch64/include/machine/exec.h b/libc/arch-arm64/include/machine/exec.h
similarity index 100%
rename from libc/arch-aarch64/include/machine/exec.h
rename to libc/arch-arm64/include/machine/exec.h
diff --git a/libc/arch-aarch64/include/machine/ieee.h b/libc/arch-arm64/include/machine/ieee.h
similarity index 100%
rename from libc/arch-aarch64/include/machine/ieee.h
rename to libc/arch-arm64/include/machine/ieee.h
diff --git a/libc/arch-aarch64/include/machine/limits.h b/libc/arch-arm64/include/machine/limits.h
similarity index 100%
rename from libc/arch-aarch64/include/machine/limits.h
rename to libc/arch-arm64/include/machine/limits.h
diff --git a/libc/arch-aarch64/include/machine/setjmp.h b/libc/arch-arm64/include/machine/setjmp.h
similarity index 100%
rename from libc/arch-aarch64/include/machine/setjmp.h
rename to libc/arch-arm64/include/machine/setjmp.h
diff --git a/libc/arch-arm64/syscalls.mk b/libc/arch-arm64/syscalls.mk
new file mode 100644
index 0000000..f1de5a5
--- /dev/null
+++ b/libc/arch-arm64/syscalls.mk
@@ -0,0 +1,190 @@
+# 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/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-aarch64/syscalls/__brk.S b/libc/arch-arm64/syscalls/__brk.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__brk.S
rename to libc/arch-arm64/syscalls/__brk.S
diff --git a/libc/arch-aarch64/syscalls/__epoll_pwait.S b/libc/arch-arm64/syscalls/__epoll_pwait.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__epoll_pwait.S
rename to libc/arch-arm64/syscalls/__epoll_pwait.S
diff --git a/libc/arch-aarch64/syscalls/__exit.S b/libc/arch-arm64/syscalls/__exit.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__exit.S
rename to libc/arch-arm64/syscalls/__exit.S
diff --git a/libc/arch-aarch64/syscalls/__getcpu.S b/libc/arch-arm64/syscalls/__getcpu.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__getcpu.S
rename to libc/arch-arm64/syscalls/__getcpu.S
diff --git a/libc/arch-aarch64/syscalls/__getcwd.S b/libc/arch-arm64/syscalls/__getcwd.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__getcwd.S
rename to libc/arch-arm64/syscalls/__getcwd.S
diff --git a/libc/arch-aarch64/syscalls/__getpriority.S b/libc/arch-arm64/syscalls/__getpriority.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__getpriority.S
rename to libc/arch-arm64/syscalls/__getpriority.S
diff --git a/libc/arch-aarch64/syscalls/__ioctl.S b/libc/arch-arm64/syscalls/__ioctl.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__ioctl.S
rename to libc/arch-arm64/syscalls/__ioctl.S
diff --git a/libc/arch-aarch64/syscalls/__openat.S b/libc/arch-arm64/syscalls/__openat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__openat.S
rename to libc/arch-arm64/syscalls/__openat.S
diff --git a/libc/arch-aarch64/syscalls/__ppoll.S b/libc/arch-arm64/syscalls/__ppoll.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__ppoll.S
rename to libc/arch-arm64/syscalls/__ppoll.S
diff --git a/libc/arch-aarch64/syscalls/__pselect6.S b/libc/arch-arm64/syscalls/__pselect6.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__pselect6.S
rename to libc/arch-arm64/syscalls/__pselect6.S
diff --git a/libc/arch-aarch64/syscalls/__ptrace.S b/libc/arch-arm64/syscalls/__ptrace.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__ptrace.S
rename to libc/arch-arm64/syscalls/__ptrace.S
diff --git a/libc/arch-aarch64/syscalls/__reboot.S b/libc/arch-arm64/syscalls/__reboot.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__reboot.S
rename to libc/arch-arm64/syscalls/__reboot.S
diff --git a/libc/arch-aarch64/syscalls/__rt_sigaction.S b/libc/arch-arm64/syscalls/__rt_sigaction.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__rt_sigaction.S
rename to libc/arch-arm64/syscalls/__rt_sigaction.S
diff --git a/libc/arch-aarch64/syscalls/__rt_sigpending.S b/libc/arch-arm64/syscalls/__rt_sigpending.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__rt_sigpending.S
rename to libc/arch-arm64/syscalls/__rt_sigpending.S
diff --git a/libc/arch-aarch64/syscalls/__rt_sigprocmask.S b/libc/arch-arm64/syscalls/__rt_sigprocmask.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__rt_sigprocmask.S
rename to libc/arch-arm64/syscalls/__rt_sigprocmask.S
diff --git a/libc/arch-aarch64/syscalls/__rt_sigsuspend.S b/libc/arch-arm64/syscalls/__rt_sigsuspend.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__rt_sigsuspend.S
rename to libc/arch-arm64/syscalls/__rt_sigsuspend.S
diff --git a/libc/arch-aarch64/syscalls/__rt_sigtimedwait.S b/libc/arch-arm64/syscalls/__rt_sigtimedwait.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__rt_sigtimedwait.S
rename to libc/arch-arm64/syscalls/__rt_sigtimedwait.S
diff --git a/libc/arch-aarch64/syscalls/__sched_getaffinity.S b/libc/arch-arm64/syscalls/__sched_getaffinity.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__sched_getaffinity.S
rename to libc/arch-arm64/syscalls/__sched_getaffinity.S
diff --git a/libc/arch-aarch64/syscalls/__set_tid_address.S b/libc/arch-arm64/syscalls/__set_tid_address.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__set_tid_address.S
rename to libc/arch-arm64/syscalls/__set_tid_address.S
diff --git a/libc/arch-aarch64/syscalls/__syslog.S b/libc/arch-arm64/syscalls/__syslog.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__syslog.S
rename to libc/arch-arm64/syscalls/__syslog.S
diff --git a/libc/arch-aarch64/syscalls/__timer_create.S b/libc/arch-arm64/syscalls/__timer_create.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__timer_create.S
rename to libc/arch-arm64/syscalls/__timer_create.S
diff --git a/libc/arch-aarch64/syscalls/__timer_delete.S b/libc/arch-arm64/syscalls/__timer_delete.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__timer_delete.S
rename to libc/arch-arm64/syscalls/__timer_delete.S
diff --git a/libc/arch-aarch64/syscalls/__timer_getoverrun.S b/libc/arch-arm64/syscalls/__timer_getoverrun.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__timer_getoverrun.S
rename to libc/arch-arm64/syscalls/__timer_getoverrun.S
diff --git a/libc/arch-aarch64/syscalls/__timer_gettime.S b/libc/arch-arm64/syscalls/__timer_gettime.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__timer_gettime.S
rename to libc/arch-arm64/syscalls/__timer_gettime.S
diff --git a/libc/arch-aarch64/syscalls/__timer_settime.S b/libc/arch-arm64/syscalls/__timer_settime.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__timer_settime.S
rename to libc/arch-arm64/syscalls/__timer_settime.S
diff --git a/libc/arch-aarch64/syscalls/__waitid.S b/libc/arch-arm64/syscalls/__waitid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/__waitid.S
rename to libc/arch-arm64/syscalls/__waitid.S
diff --git a/libc/arch-aarch64/syscalls/_exit.S b/libc/arch-arm64/syscalls/_exit.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/_exit.S
rename to libc/arch-arm64/syscalls/_exit.S
diff --git a/libc/arch-aarch64/syscalls/accept.S b/libc/arch-arm64/syscalls/accept.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/accept.S
rename to libc/arch-arm64/syscalls/accept.S
diff --git a/libc/arch-aarch64/syscalls/acct.S b/libc/arch-arm64/syscalls/acct.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/acct.S
rename to libc/arch-arm64/syscalls/acct.S
diff --git a/libc/arch-aarch64/syscalls/bind.S b/libc/arch-arm64/syscalls/bind.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/bind.S
rename to libc/arch-arm64/syscalls/bind.S
diff --git a/libc/arch-aarch64/syscalls/capget.S b/libc/arch-arm64/syscalls/capget.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/capget.S
rename to libc/arch-arm64/syscalls/capget.S
diff --git a/libc/arch-aarch64/syscalls/capset.S b/libc/arch-arm64/syscalls/capset.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/capset.S
rename to libc/arch-arm64/syscalls/capset.S
diff --git a/libc/arch-aarch64/syscalls/chdir.S b/libc/arch-arm64/syscalls/chdir.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/chdir.S
rename to libc/arch-arm64/syscalls/chdir.S
diff --git a/libc/arch-aarch64/syscalls/chroot.S b/libc/arch-arm64/syscalls/chroot.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/chroot.S
rename to libc/arch-arm64/syscalls/chroot.S
diff --git a/libc/arch-aarch64/syscalls/clock_getres.S b/libc/arch-arm64/syscalls/clock_getres.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/clock_getres.S
rename to libc/arch-arm64/syscalls/clock_getres.S
diff --git a/libc/arch-aarch64/syscalls/clock_gettime.S b/libc/arch-arm64/syscalls/clock_gettime.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/clock_gettime.S
rename to libc/arch-arm64/syscalls/clock_gettime.S
diff --git a/libc/arch-aarch64/syscalls/clock_nanosleep.S b/libc/arch-arm64/syscalls/clock_nanosleep.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/clock_nanosleep.S
rename to libc/arch-arm64/syscalls/clock_nanosleep.S
diff --git a/libc/arch-aarch64/syscalls/clock_settime.S b/libc/arch-arm64/syscalls/clock_settime.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/clock_settime.S
rename to libc/arch-arm64/syscalls/clock_settime.S
diff --git a/libc/arch-aarch64/syscalls/close.S b/libc/arch-arm64/syscalls/close.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/close.S
rename to libc/arch-arm64/syscalls/close.S
diff --git a/libc/arch-aarch64/syscalls/connect.S b/libc/arch-arm64/syscalls/connect.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/connect.S
rename to libc/arch-arm64/syscalls/connect.S
diff --git a/libc/arch-aarch64/syscalls/delete_module.S b/libc/arch-arm64/syscalls/delete_module.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/delete_module.S
rename to libc/arch-arm64/syscalls/delete_module.S
diff --git a/libc/arch-aarch64/syscalls/dup.S b/libc/arch-arm64/syscalls/dup.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/dup.S
rename to libc/arch-arm64/syscalls/dup.S
diff --git a/libc/arch-aarch64/syscalls/dup3.S b/libc/arch-arm64/syscalls/dup3.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/dup3.S
rename to libc/arch-arm64/syscalls/dup3.S
diff --git a/libc/arch-aarch64/syscalls/epoll_create1.S b/libc/arch-arm64/syscalls/epoll_create1.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/epoll_create1.S
rename to libc/arch-arm64/syscalls/epoll_create1.S
diff --git a/libc/arch-aarch64/syscalls/epoll_ctl.S b/libc/arch-arm64/syscalls/epoll_ctl.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/epoll_ctl.S
rename to libc/arch-arm64/syscalls/epoll_ctl.S
diff --git a/libc/arch-aarch64/syscalls/eventfd.S b/libc/arch-arm64/syscalls/eventfd.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/eventfd.S
rename to libc/arch-arm64/syscalls/eventfd.S
diff --git a/libc/arch-aarch64/syscalls/execve.S b/libc/arch-arm64/syscalls/execve.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/execve.S
rename to libc/arch-arm64/syscalls/execve.S
diff --git a/libc/arch-aarch64/syscalls/faccessat.S b/libc/arch-arm64/syscalls/faccessat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/faccessat.S
rename to libc/arch-arm64/syscalls/faccessat.S
diff --git a/libc/arch-aarch64/syscalls/fchdir.S b/libc/arch-arm64/syscalls/fchdir.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fchdir.S
rename to libc/arch-arm64/syscalls/fchdir.S
diff --git a/libc/arch-aarch64/syscalls/fchmod.S b/libc/arch-arm64/syscalls/fchmod.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fchmod.S
rename to libc/arch-arm64/syscalls/fchmod.S
diff --git a/libc/arch-aarch64/syscalls/fchmodat.S b/libc/arch-arm64/syscalls/fchmodat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fchmodat.S
rename to libc/arch-arm64/syscalls/fchmodat.S
diff --git a/libc/arch-aarch64/syscalls/fchown.S b/libc/arch-arm64/syscalls/fchown.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fchown.S
rename to libc/arch-arm64/syscalls/fchown.S
diff --git a/libc/arch-aarch64/syscalls/fchownat.S b/libc/arch-arm64/syscalls/fchownat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fchownat.S
rename to libc/arch-arm64/syscalls/fchownat.S
diff --git a/libc/arch-aarch64/syscalls/fcntl.S b/libc/arch-arm64/syscalls/fcntl.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fcntl.S
rename to libc/arch-arm64/syscalls/fcntl.S
diff --git a/libc/arch-aarch64/syscalls/fdatasync.S b/libc/arch-arm64/syscalls/fdatasync.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fdatasync.S
rename to libc/arch-arm64/syscalls/fdatasync.S
diff --git a/libc/arch-aarch64/syscalls/fgetxattr.S b/libc/arch-arm64/syscalls/fgetxattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fgetxattr.S
rename to libc/arch-arm64/syscalls/fgetxattr.S
diff --git a/libc/arch-aarch64/syscalls/flistxattr.S b/libc/arch-arm64/syscalls/flistxattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/flistxattr.S
rename to libc/arch-arm64/syscalls/flistxattr.S
diff --git a/libc/arch-aarch64/syscalls/flock.S b/libc/arch-arm64/syscalls/flock.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/flock.S
rename to libc/arch-arm64/syscalls/flock.S
diff --git a/libc/arch-aarch64/syscalls/fremovexattr.S b/libc/arch-arm64/syscalls/fremovexattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fremovexattr.S
rename to libc/arch-arm64/syscalls/fremovexattr.S
diff --git a/libc/arch-aarch64/syscalls/fsetxattr.S b/libc/arch-arm64/syscalls/fsetxattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fsetxattr.S
rename to libc/arch-arm64/syscalls/fsetxattr.S
diff --git a/libc/arch-aarch64/syscalls/fstat.S b/libc/arch-arm64/syscalls/fstat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fstat.S
rename to libc/arch-arm64/syscalls/fstat.S
diff --git a/libc/arch-aarch64/syscalls/fstatat.S b/libc/arch-arm64/syscalls/fstatat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fstatat.S
rename to libc/arch-arm64/syscalls/fstatat.S
diff --git a/libc/arch-aarch64/syscalls/fstatfs.S b/libc/arch-arm64/syscalls/fstatfs.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fstatfs.S
rename to libc/arch-arm64/syscalls/fstatfs.S
diff --git a/libc/arch-aarch64/syscalls/fsync.S b/libc/arch-arm64/syscalls/fsync.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/fsync.S
rename to libc/arch-arm64/syscalls/fsync.S
diff --git a/libc/arch-aarch64/syscalls/ftruncate.S b/libc/arch-arm64/syscalls/ftruncate.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/ftruncate.S
rename to libc/arch-arm64/syscalls/ftruncate.S
diff --git a/libc/arch-aarch64/syscalls/futex.S b/libc/arch-arm64/syscalls/futex.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/futex.S
rename to libc/arch-arm64/syscalls/futex.S
diff --git a/libc/arch-aarch64/syscalls/getdents.S b/libc/arch-arm64/syscalls/getdents.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getdents.S
rename to libc/arch-arm64/syscalls/getdents.S
diff --git a/libc/arch-aarch64/syscalls/getegid.S b/libc/arch-arm64/syscalls/getegid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getegid.S
rename to libc/arch-arm64/syscalls/getegid.S
diff --git a/libc/arch-aarch64/syscalls/geteuid.S b/libc/arch-arm64/syscalls/geteuid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/geteuid.S
rename to libc/arch-arm64/syscalls/geteuid.S
diff --git a/libc/arch-aarch64/syscalls/getgid.S b/libc/arch-arm64/syscalls/getgid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getgid.S
rename to libc/arch-arm64/syscalls/getgid.S
diff --git a/libc/arch-aarch64/syscalls/getgroups.S b/libc/arch-arm64/syscalls/getgroups.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getgroups.S
rename to libc/arch-arm64/syscalls/getgroups.S
diff --git a/libc/arch-aarch64/syscalls/getitimer.S b/libc/arch-arm64/syscalls/getitimer.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getitimer.S
rename to libc/arch-arm64/syscalls/getitimer.S
diff --git a/libc/arch-aarch64/syscalls/getpeername.S b/libc/arch-arm64/syscalls/getpeername.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getpeername.S
rename to libc/arch-arm64/syscalls/getpeername.S
diff --git a/libc/arch-aarch64/syscalls/getpgid.S b/libc/arch-arm64/syscalls/getpgid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getpgid.S
rename to libc/arch-arm64/syscalls/getpgid.S
diff --git a/libc/arch-aarch64/syscalls/getpid.S b/libc/arch-arm64/syscalls/getpid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getpid.S
rename to libc/arch-arm64/syscalls/getpid.S
diff --git a/libc/arch-aarch64/syscalls/getppid.S b/libc/arch-arm64/syscalls/getppid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getppid.S
rename to libc/arch-arm64/syscalls/getppid.S
diff --git a/libc/arch-aarch64/syscalls/getresgid.S b/libc/arch-arm64/syscalls/getresgid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getresgid.S
rename to libc/arch-arm64/syscalls/getresgid.S
diff --git a/libc/arch-aarch64/syscalls/getresuid.S b/libc/arch-arm64/syscalls/getresuid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getresuid.S
rename to libc/arch-arm64/syscalls/getresuid.S
diff --git a/libc/arch-aarch64/syscalls/getrlimit.S b/libc/arch-arm64/syscalls/getrlimit.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getrlimit.S
rename to libc/arch-arm64/syscalls/getrlimit.S
diff --git a/libc/arch-aarch64/syscalls/getrusage.S b/libc/arch-arm64/syscalls/getrusage.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getrusage.S
rename to libc/arch-arm64/syscalls/getrusage.S
diff --git a/libc/arch-aarch64/syscalls/getsid.S b/libc/arch-arm64/syscalls/getsid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getsid.S
rename to libc/arch-arm64/syscalls/getsid.S
diff --git a/libc/arch-aarch64/syscalls/getsockname.S b/libc/arch-arm64/syscalls/getsockname.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getsockname.S
rename to libc/arch-arm64/syscalls/getsockname.S
diff --git a/libc/arch-aarch64/syscalls/getsockopt.S b/libc/arch-arm64/syscalls/getsockopt.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getsockopt.S
rename to libc/arch-arm64/syscalls/getsockopt.S
diff --git a/libc/arch-aarch64/syscalls/gettid.S b/libc/arch-arm64/syscalls/gettid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/gettid.S
rename to libc/arch-arm64/syscalls/gettid.S
diff --git a/libc/arch-aarch64/syscalls/gettimeofday.S b/libc/arch-arm64/syscalls/gettimeofday.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/gettimeofday.S
rename to libc/arch-arm64/syscalls/gettimeofday.S
diff --git a/libc/arch-aarch64/syscalls/getuid.S b/libc/arch-arm64/syscalls/getuid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getuid.S
rename to libc/arch-arm64/syscalls/getuid.S
diff --git a/libc/arch-aarch64/syscalls/getxattr.S b/libc/arch-arm64/syscalls/getxattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/getxattr.S
rename to libc/arch-arm64/syscalls/getxattr.S
diff --git a/libc/arch-aarch64/syscalls/init_module.S b/libc/arch-arm64/syscalls/init_module.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/init_module.S
rename to libc/arch-arm64/syscalls/init_module.S
diff --git a/libc/arch-aarch64/syscalls/inotify_add_watch.S b/libc/arch-arm64/syscalls/inotify_add_watch.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/inotify_add_watch.S
rename to libc/arch-arm64/syscalls/inotify_add_watch.S
diff --git a/libc/arch-aarch64/syscalls/inotify_init1.S b/libc/arch-arm64/syscalls/inotify_init1.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/inotify_init1.S
rename to libc/arch-arm64/syscalls/inotify_init1.S
diff --git a/libc/arch-aarch64/syscalls/inotify_rm_watch.S b/libc/arch-arm64/syscalls/inotify_rm_watch.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/inotify_rm_watch.S
rename to libc/arch-arm64/syscalls/inotify_rm_watch.S
diff --git a/libc/arch-aarch64/syscalls/ioprio_get.S b/libc/arch-arm64/syscalls/ioprio_get.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/ioprio_get.S
rename to libc/arch-arm64/syscalls/ioprio_get.S
diff --git a/libc/arch-aarch64/syscalls/ioprio_set.S b/libc/arch-arm64/syscalls/ioprio_set.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/ioprio_set.S
rename to libc/arch-arm64/syscalls/ioprio_set.S
diff --git a/libc/arch-aarch64/syscalls/kill.S b/libc/arch-arm64/syscalls/kill.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/kill.S
rename to libc/arch-arm64/syscalls/kill.S
diff --git a/libc/arch-aarch64/syscalls/klogctl.S b/libc/arch-arm64/syscalls/klogctl.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/klogctl.S
rename to libc/arch-arm64/syscalls/klogctl.S
diff --git a/libc/arch-aarch64/syscalls/lgetxattr.S b/libc/arch-arm64/syscalls/lgetxattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/lgetxattr.S
rename to libc/arch-arm64/syscalls/lgetxattr.S
diff --git a/libc/arch-aarch64/syscalls/linkat.S b/libc/arch-arm64/syscalls/linkat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/linkat.S
rename to libc/arch-arm64/syscalls/linkat.S
diff --git a/libc/arch-aarch64/syscalls/listen.S b/libc/arch-arm64/syscalls/listen.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/listen.S
rename to libc/arch-arm64/syscalls/listen.S
diff --git a/libc/arch-aarch64/syscalls/listxattr.S b/libc/arch-arm64/syscalls/listxattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/listxattr.S
rename to libc/arch-arm64/syscalls/listxattr.S
diff --git a/libc/arch-aarch64/syscalls/llistxattr.S b/libc/arch-arm64/syscalls/llistxattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/llistxattr.S
rename to libc/arch-arm64/syscalls/llistxattr.S
diff --git a/libc/arch-aarch64/syscalls/lremovexattr.S b/libc/arch-arm64/syscalls/lremovexattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/lremovexattr.S
rename to libc/arch-arm64/syscalls/lremovexattr.S
diff --git a/libc/arch-aarch64/syscalls/lseek.S b/libc/arch-arm64/syscalls/lseek.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/lseek.S
rename to libc/arch-arm64/syscalls/lseek.S
diff --git a/libc/arch-aarch64/syscalls/lsetxattr.S b/libc/arch-arm64/syscalls/lsetxattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/lsetxattr.S
rename to libc/arch-arm64/syscalls/lsetxattr.S
diff --git a/libc/arch-aarch64/syscalls/madvise.S b/libc/arch-arm64/syscalls/madvise.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/madvise.S
rename to libc/arch-arm64/syscalls/madvise.S
diff --git a/libc/arch-aarch64/syscalls/mincore.S b/libc/arch-arm64/syscalls/mincore.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/mincore.S
rename to libc/arch-arm64/syscalls/mincore.S
diff --git a/libc/arch-aarch64/syscalls/mkdirat.S b/libc/arch-arm64/syscalls/mkdirat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/mkdirat.S
rename to libc/arch-arm64/syscalls/mkdirat.S
diff --git a/libc/arch-aarch64/syscalls/mknodat.S b/libc/arch-arm64/syscalls/mknodat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/mknodat.S
rename to libc/arch-arm64/syscalls/mknodat.S
diff --git a/libc/arch-aarch64/syscalls/mlock.S b/libc/arch-arm64/syscalls/mlock.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/mlock.S
rename to libc/arch-arm64/syscalls/mlock.S
diff --git a/libc/arch-aarch64/syscalls/mlockall.S b/libc/arch-arm64/syscalls/mlockall.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/mlockall.S
rename to libc/arch-arm64/syscalls/mlockall.S
diff --git a/libc/arch-aarch64/syscalls/mmap.S b/libc/arch-arm64/syscalls/mmap.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/mmap.S
rename to libc/arch-arm64/syscalls/mmap.S
diff --git a/libc/arch-aarch64/syscalls/mount.S b/libc/arch-arm64/syscalls/mount.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/mount.S
rename to libc/arch-arm64/syscalls/mount.S
diff --git a/libc/arch-aarch64/syscalls/mprotect.S b/libc/arch-arm64/syscalls/mprotect.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/mprotect.S
rename to libc/arch-arm64/syscalls/mprotect.S
diff --git a/libc/arch-aarch64/syscalls/mremap.S b/libc/arch-arm64/syscalls/mremap.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/mremap.S
rename to libc/arch-arm64/syscalls/mremap.S
diff --git a/libc/arch-aarch64/syscalls/msync.S b/libc/arch-arm64/syscalls/msync.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/msync.S
rename to libc/arch-arm64/syscalls/msync.S
diff --git a/libc/arch-aarch64/syscalls/munlock.S b/libc/arch-arm64/syscalls/munlock.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/munlock.S
rename to libc/arch-arm64/syscalls/munlock.S
diff --git a/libc/arch-aarch64/syscalls/munlockall.S b/libc/arch-arm64/syscalls/munlockall.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/munlockall.S
rename to libc/arch-arm64/syscalls/munlockall.S
diff --git a/libc/arch-aarch64/syscalls/munmap.S b/libc/arch-arm64/syscalls/munmap.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/munmap.S
rename to libc/arch-arm64/syscalls/munmap.S
diff --git a/libc/arch-aarch64/syscalls/nanosleep.S b/libc/arch-arm64/syscalls/nanosleep.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/nanosleep.S
rename to libc/arch-arm64/syscalls/nanosleep.S
diff --git a/libc/arch-aarch64/syscalls/perf_event_open.S b/libc/arch-arm64/syscalls/perf_event_open.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/perf_event_open.S
rename to libc/arch-arm64/syscalls/perf_event_open.S
diff --git a/libc/arch-aarch64/syscalls/personality.S b/libc/arch-arm64/syscalls/personality.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/personality.S
rename to libc/arch-arm64/syscalls/personality.S
diff --git a/libc/arch-aarch64/syscalls/pipe2.S b/libc/arch-arm64/syscalls/pipe2.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/pipe2.S
rename to libc/arch-arm64/syscalls/pipe2.S
diff --git a/libc/arch-aarch64/syscalls/prctl.S b/libc/arch-arm64/syscalls/prctl.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/prctl.S
rename to libc/arch-arm64/syscalls/prctl.S
diff --git a/libc/arch-aarch64/syscalls/pread64.S b/libc/arch-arm64/syscalls/pread64.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/pread64.S
rename to libc/arch-arm64/syscalls/pread64.S
diff --git a/libc/arch-aarch64/syscalls/prlimit64.S b/libc/arch-arm64/syscalls/prlimit64.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/prlimit64.S
rename to libc/arch-arm64/syscalls/prlimit64.S
diff --git a/libc/arch-aarch64/syscalls/pwrite64.S b/libc/arch-arm64/syscalls/pwrite64.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/pwrite64.S
rename to libc/arch-arm64/syscalls/pwrite64.S
diff --git a/libc/arch-aarch64/syscalls/read.S b/libc/arch-arm64/syscalls/read.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/read.S
rename to libc/arch-arm64/syscalls/read.S
diff --git a/libc/arch-aarch64/syscalls/readahead.S b/libc/arch-arm64/syscalls/readahead.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/readahead.S
rename to libc/arch-arm64/syscalls/readahead.S
diff --git a/libc/arch-aarch64/syscalls/readlinkat.S b/libc/arch-arm64/syscalls/readlinkat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/readlinkat.S
rename to libc/arch-arm64/syscalls/readlinkat.S
diff --git a/libc/arch-aarch64/syscalls/readv.S b/libc/arch-arm64/syscalls/readv.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/readv.S
rename to libc/arch-arm64/syscalls/readv.S
diff --git a/libc/arch-aarch64/syscalls/recvfrom.S b/libc/arch-arm64/syscalls/recvfrom.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/recvfrom.S
rename to libc/arch-arm64/syscalls/recvfrom.S
diff --git a/libc/arch-aarch64/syscalls/recvmsg.S b/libc/arch-arm64/syscalls/recvmsg.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/recvmsg.S
rename to libc/arch-arm64/syscalls/recvmsg.S
diff --git a/libc/arch-aarch64/syscalls/removexattr.S b/libc/arch-arm64/syscalls/removexattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/removexattr.S
rename to libc/arch-arm64/syscalls/removexattr.S
diff --git a/libc/arch-aarch64/syscalls/renameat.S b/libc/arch-arm64/syscalls/renameat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/renameat.S
rename to libc/arch-arm64/syscalls/renameat.S
diff --git a/libc/arch-aarch64/syscalls/sched_get_priority_max.S b/libc/arch-arm64/syscalls/sched_get_priority_max.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sched_get_priority_max.S
rename to libc/arch-arm64/syscalls/sched_get_priority_max.S
diff --git a/libc/arch-aarch64/syscalls/sched_get_priority_min.S b/libc/arch-arm64/syscalls/sched_get_priority_min.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sched_get_priority_min.S
rename to libc/arch-arm64/syscalls/sched_get_priority_min.S
diff --git a/libc/arch-aarch64/syscalls/sched_getparam.S b/libc/arch-arm64/syscalls/sched_getparam.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sched_getparam.S
rename to libc/arch-arm64/syscalls/sched_getparam.S
diff --git a/libc/arch-aarch64/syscalls/sched_getscheduler.S b/libc/arch-arm64/syscalls/sched_getscheduler.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sched_getscheduler.S
rename to libc/arch-arm64/syscalls/sched_getscheduler.S
diff --git a/libc/arch-aarch64/syscalls/sched_rr_get_interval.S b/libc/arch-arm64/syscalls/sched_rr_get_interval.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sched_rr_get_interval.S
rename to libc/arch-arm64/syscalls/sched_rr_get_interval.S
diff --git a/libc/arch-aarch64/syscalls/sched_setaffinity.S b/libc/arch-arm64/syscalls/sched_setaffinity.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sched_setaffinity.S
rename to libc/arch-arm64/syscalls/sched_setaffinity.S
diff --git a/libc/arch-aarch64/syscalls/sched_setparam.S b/libc/arch-arm64/syscalls/sched_setparam.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sched_setparam.S
rename to libc/arch-arm64/syscalls/sched_setparam.S
diff --git a/libc/arch-aarch64/syscalls/sched_setscheduler.S b/libc/arch-arm64/syscalls/sched_setscheduler.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sched_setscheduler.S
rename to libc/arch-arm64/syscalls/sched_setscheduler.S
diff --git a/libc/arch-aarch64/syscalls/sched_yield.S b/libc/arch-arm64/syscalls/sched_yield.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sched_yield.S
rename to libc/arch-arm64/syscalls/sched_yield.S
diff --git a/libc/arch-aarch64/syscalls/sendfile.S b/libc/arch-arm64/syscalls/sendfile.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sendfile.S
rename to libc/arch-arm64/syscalls/sendfile.S
diff --git a/libc/arch-aarch64/syscalls/sendmsg.S b/libc/arch-arm64/syscalls/sendmsg.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sendmsg.S
rename to libc/arch-arm64/syscalls/sendmsg.S
diff --git a/libc/arch-aarch64/syscalls/sendto.S b/libc/arch-arm64/syscalls/sendto.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sendto.S
rename to libc/arch-arm64/syscalls/sendto.S
diff --git a/libc/arch-aarch64/syscalls/setgid.S b/libc/arch-arm64/syscalls/setgid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setgid.S
rename to libc/arch-arm64/syscalls/setgid.S
diff --git a/libc/arch-aarch64/syscalls/setgroups.S b/libc/arch-arm64/syscalls/setgroups.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setgroups.S
rename to libc/arch-arm64/syscalls/setgroups.S
diff --git a/libc/arch-aarch64/syscalls/setitimer.S b/libc/arch-arm64/syscalls/setitimer.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setitimer.S
rename to libc/arch-arm64/syscalls/setitimer.S
diff --git a/libc/arch-aarch64/syscalls/setns.S b/libc/arch-arm64/syscalls/setns.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setns.S
rename to libc/arch-arm64/syscalls/setns.S
diff --git a/libc/arch-aarch64/syscalls/setpgid.S b/libc/arch-arm64/syscalls/setpgid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setpgid.S
rename to libc/arch-arm64/syscalls/setpgid.S
diff --git a/libc/arch-aarch64/syscalls/setpriority.S b/libc/arch-arm64/syscalls/setpriority.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setpriority.S
rename to libc/arch-arm64/syscalls/setpriority.S
diff --git a/libc/arch-aarch64/syscalls/setregid.S b/libc/arch-arm64/syscalls/setregid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setregid.S
rename to libc/arch-arm64/syscalls/setregid.S
diff --git a/libc/arch-aarch64/syscalls/setresgid.S b/libc/arch-arm64/syscalls/setresgid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setresgid.S
rename to libc/arch-arm64/syscalls/setresgid.S
diff --git a/libc/arch-aarch64/syscalls/setresuid.S b/libc/arch-arm64/syscalls/setresuid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setresuid.S
rename to libc/arch-arm64/syscalls/setresuid.S
diff --git a/libc/arch-aarch64/syscalls/setreuid.S b/libc/arch-arm64/syscalls/setreuid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setreuid.S
rename to libc/arch-arm64/syscalls/setreuid.S
diff --git a/libc/arch-aarch64/syscalls/setrlimit.S b/libc/arch-arm64/syscalls/setrlimit.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setrlimit.S
rename to libc/arch-arm64/syscalls/setrlimit.S
diff --git a/libc/arch-aarch64/syscalls/setsid.S b/libc/arch-arm64/syscalls/setsid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setsid.S
rename to libc/arch-arm64/syscalls/setsid.S
diff --git a/libc/arch-aarch64/syscalls/setsockopt.S b/libc/arch-arm64/syscalls/setsockopt.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setsockopt.S
rename to libc/arch-arm64/syscalls/setsockopt.S
diff --git a/libc/arch-aarch64/syscalls/settimeofday.S b/libc/arch-arm64/syscalls/settimeofday.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/settimeofday.S
rename to libc/arch-arm64/syscalls/settimeofday.S
diff --git a/libc/arch-aarch64/syscalls/setuid.S b/libc/arch-arm64/syscalls/setuid.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setuid.S
rename to libc/arch-arm64/syscalls/setuid.S
diff --git a/libc/arch-aarch64/syscalls/setxattr.S b/libc/arch-arm64/syscalls/setxattr.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/setxattr.S
rename to libc/arch-arm64/syscalls/setxattr.S
diff --git a/libc/arch-aarch64/syscalls/shutdown.S b/libc/arch-arm64/syscalls/shutdown.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/shutdown.S
rename to libc/arch-arm64/syscalls/shutdown.S
diff --git a/libc/arch-aarch64/syscalls/sigaltstack.S b/libc/arch-arm64/syscalls/sigaltstack.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sigaltstack.S
rename to libc/arch-arm64/syscalls/sigaltstack.S
diff --git a/libc/arch-aarch64/syscalls/signalfd4.S b/libc/arch-arm64/syscalls/signalfd4.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/signalfd4.S
rename to libc/arch-arm64/syscalls/signalfd4.S
diff --git a/libc/arch-aarch64/syscalls/socket.S b/libc/arch-arm64/syscalls/socket.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/socket.S
rename to libc/arch-arm64/syscalls/socket.S
diff --git a/libc/arch-aarch64/syscalls/socketpair.S b/libc/arch-arm64/syscalls/socketpair.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/socketpair.S
rename to libc/arch-arm64/syscalls/socketpair.S
diff --git a/libc/arch-aarch64/syscalls/statfs.S b/libc/arch-arm64/syscalls/statfs.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/statfs.S
rename to libc/arch-arm64/syscalls/statfs.S
diff --git a/libc/arch-aarch64/syscalls/swapoff.S b/libc/arch-arm64/syscalls/swapoff.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/swapoff.S
rename to libc/arch-arm64/syscalls/swapoff.S
diff --git a/libc/arch-aarch64/syscalls/swapon.S b/libc/arch-arm64/syscalls/swapon.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/swapon.S
rename to libc/arch-arm64/syscalls/swapon.S
diff --git a/libc/arch-aarch64/syscalls/symlinkat.S b/libc/arch-arm64/syscalls/symlinkat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/symlinkat.S
rename to libc/arch-arm64/syscalls/symlinkat.S
diff --git a/libc/arch-aarch64/syscalls/sync.S b/libc/arch-arm64/syscalls/sync.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sync.S
rename to libc/arch-arm64/syscalls/sync.S
diff --git a/libc/arch-aarch64/syscalls/sysinfo.S b/libc/arch-arm64/syscalls/sysinfo.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/sysinfo.S
rename to libc/arch-arm64/syscalls/sysinfo.S
diff --git a/libc/arch-aarch64/syscalls/tgkill.S b/libc/arch-arm64/syscalls/tgkill.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/tgkill.S
rename to libc/arch-arm64/syscalls/tgkill.S
diff --git a/libc/arch-aarch64/syscalls/timerfd_create.S b/libc/arch-arm64/syscalls/timerfd_create.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/timerfd_create.S
rename to libc/arch-arm64/syscalls/timerfd_create.S
diff --git a/libc/arch-aarch64/syscalls/timerfd_gettime.S b/libc/arch-arm64/syscalls/timerfd_gettime.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/timerfd_gettime.S
rename to libc/arch-arm64/syscalls/timerfd_gettime.S
diff --git a/libc/arch-aarch64/syscalls/timerfd_settime.S b/libc/arch-arm64/syscalls/timerfd_settime.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/timerfd_settime.S
rename to libc/arch-arm64/syscalls/timerfd_settime.S
diff --git a/libc/arch-aarch64/syscalls/times.S b/libc/arch-arm64/syscalls/times.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/times.S
rename to libc/arch-arm64/syscalls/times.S
diff --git a/libc/arch-aarch64/syscalls/tkill.S b/libc/arch-arm64/syscalls/tkill.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/tkill.S
rename to libc/arch-arm64/syscalls/tkill.S
diff --git a/libc/arch-aarch64/syscalls/truncate.S b/libc/arch-arm64/syscalls/truncate.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/truncate.S
rename to libc/arch-arm64/syscalls/truncate.S
diff --git a/libc/arch-aarch64/syscalls/umask.S b/libc/arch-arm64/syscalls/umask.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/umask.S
rename to libc/arch-arm64/syscalls/umask.S
diff --git a/libc/arch-aarch64/syscalls/umount2.S b/libc/arch-arm64/syscalls/umount2.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/umount2.S
rename to libc/arch-arm64/syscalls/umount2.S
diff --git a/libc/arch-aarch64/syscalls/uname.S b/libc/arch-arm64/syscalls/uname.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/uname.S
rename to libc/arch-arm64/syscalls/uname.S
diff --git a/libc/arch-aarch64/syscalls/unlinkat.S b/libc/arch-arm64/syscalls/unlinkat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/unlinkat.S
rename to libc/arch-arm64/syscalls/unlinkat.S
diff --git a/libc/arch-aarch64/syscalls/unshare.S b/libc/arch-arm64/syscalls/unshare.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/unshare.S
rename to libc/arch-arm64/syscalls/unshare.S
diff --git a/libc/arch-aarch64/syscalls/utimensat.S b/libc/arch-arm64/syscalls/utimensat.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/utimensat.S
rename to libc/arch-arm64/syscalls/utimensat.S
diff --git a/libc/arch-aarch64/syscalls/wait4.S b/libc/arch-arm64/syscalls/wait4.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/wait4.S
rename to libc/arch-arm64/syscalls/wait4.S
diff --git a/libc/arch-aarch64/syscalls/write.S b/libc/arch-arm64/syscalls/write.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/write.S
rename to libc/arch-arm64/syscalls/write.S
diff --git a/libc/arch-aarch64/syscalls/writev.S b/libc/arch-arm64/syscalls/writev.S
similarity index 100%
rename from libc/arch-aarch64/syscalls/writev.S
rename to libc/arch-arm64/syscalls/writev.S
diff --git a/libc/kernel/tools/defaults.py b/libc/kernel/tools/defaults.py
index f6486d7..f235803 100644
--- a/libc/kernel/tools/defaults.py
+++ b/libc/kernel/tools/defaults.py
@@ -7,7 +7,7 @@
 
 # the list of supported architectures
 #
-kernel_archs = [ 'aarch64', 'arm', 'mips', 'x86' ]
+kernel_archs = [ 'arm', 'arm64', 'mips', 'x86' ]
 
 # the list of include directories that belong to the kernel
 # tree. used when looking for sources...
@@ -45,15 +45,15 @@
 # maps an architecture to a set of default macros that would be provided by
 # toolchain preprocessor
 kernel_default_arch_macros = {
-    "aarch64": {},
     "arm": {},
+    "arm64": {},
     "mips": {"CONFIG_32BIT":"1"},
     "x86": {},
     }
 
 kernel_arch_token_replacements = {
-    "aarch64": {},
     "arm": {},
+    "arm64": {},
     "mips": {"off_t":"__kernel_off_t"},
     "x86": {},
     }
@@ -66,13 +66,13 @@
 # this is the set of known static inline functions that we want to keep
 # in the final ARM headers. this is only used to keep optimized byteswapping
 # static functions and stuff like that.
-kernel_known_aarch64_statics = set(
-        [
+kernel_known_arm_statics = set(
+        [ "___arch__swab32",    # asm-arm/byteorder.h
         ]
     )
 
-kernel_known_arm_statics = set(
-        [ "___arch__swab32",    # asm-arm/byteorder.h
+kernel_known_arm64_statics = set(
+        [
         ]
     )
 
@@ -100,8 +100,8 @@
 # we want to keep in the final headers
 #
 kernel_known_statics = {
-        "aarch64" : kernel_known_aarch64_statics,
         "arm" : kernel_known_arm_statics,
+        "arm64" : kernel_known_arm64_statics,
         "mips" : kernel_known_mips_statics,
         "x86" : kernel_known_x86_statics,
     }
diff --git a/libc/kernel/tools/generate_uapi_headers.sh b/libc/kernel/tools/generate_uapi_headers.sh
index de89838..9eeb2a5 100755
--- a/libc/kernel/tools/generate_uapi_headers.sh
+++ b/libc/kernel/tools/generate_uapi_headers.sh
@@ -186,22 +186,16 @@
           "${ANDROID_KERNEL_DIR}/uapi"
 
 for arch in "${ARCH_LIST[@]}"; do
-  if [[ "$arch" == "arm64" ]]; then
-    # The Android headers use aarch64 as the name of the 64 bit arm headers.
-    tgt_arch="asm-aarch64"
-  else
-    tgt_arch="asm-${arch}"
-  fi
   # Copy arch headers.
   copy_hdrs "${KERNEL_DIR}/common/arch/${arch}/include/uapi" \
-            "${ANDROID_KERNEL_DIR}/uapi/${tgt_arch}"
+            "${ANDROID_KERNEL_DIR}/uapi/asm-${arch}"
   # Copy the generated arch headers.
   copy_hdrs "${KERNEL_DIR}/common/arch/${arch}/include/generated/uapi" \
-            "${ANDROID_KERNEL_DIR}/uapi/${tgt_arch}"
+            "${ANDROID_KERNEL_DIR}/uapi/asm-${arch}"
 
   # Special copy of generated header files from arch/<ARCH>/generated/asm that
   # also exist in uapi/asm-generic.
   copy_if_exists "${KERNEL_DIR}/common/include/uapi/asm-generic" \
                  "${KERNEL_DIR}/common/arch/${arch}/include/generated/asm" \
-                 "${ANDROID_KERNEL_DIR}/uapi/${tgt_arch}/asm"
+                 "${ANDROID_KERNEL_DIR}/uapi/asm-${arch}/asm"
 done
diff --git a/libc/kernel/uapi/asm-aarch64/asm/auxvec.h b/libc/kernel/uapi/asm-arm64/asm/auxvec.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/auxvec.h
rename to libc/kernel/uapi/asm-arm64/asm/auxvec.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/bitsperlong.h b/libc/kernel/uapi/asm-arm64/asm/bitsperlong.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/bitsperlong.h
rename to libc/kernel/uapi/asm-arm64/asm/bitsperlong.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/byteorder.h b/libc/kernel/uapi/asm-arm64/asm/byteorder.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/byteorder.h
rename to libc/kernel/uapi/asm-arm64/asm/byteorder.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/errno.h b/libc/kernel/uapi/asm-arm64/asm/errno.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/errno.h
rename to libc/kernel/uapi/asm-arm64/asm/errno.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/fcntl.h b/libc/kernel/uapi/asm-arm64/asm/fcntl.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/fcntl.h
rename to libc/kernel/uapi/asm-arm64/asm/fcntl.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/hwcap.h b/libc/kernel/uapi/asm-arm64/asm/hwcap.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/hwcap.h
rename to libc/kernel/uapi/asm-arm64/asm/hwcap.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/ioctl.h b/libc/kernel/uapi/asm-arm64/asm/ioctl.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/ioctl.h
rename to libc/kernel/uapi/asm-arm64/asm/ioctl.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/ioctls.h b/libc/kernel/uapi/asm-arm64/asm/ioctls.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/ioctls.h
rename to libc/kernel/uapi/asm-arm64/asm/ioctls.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/ipcbuf.h b/libc/kernel/uapi/asm-arm64/asm/ipcbuf.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/ipcbuf.h
rename to libc/kernel/uapi/asm-arm64/asm/ipcbuf.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/kvm_para.h b/libc/kernel/uapi/asm-arm64/asm/kvm_para.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/kvm_para.h
rename to libc/kernel/uapi/asm-arm64/asm/kvm_para.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/mman.h b/libc/kernel/uapi/asm-arm64/asm/mman.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/mman.h
rename to libc/kernel/uapi/asm-arm64/asm/mman.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/msgbuf.h b/libc/kernel/uapi/asm-arm64/asm/msgbuf.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/msgbuf.h
rename to libc/kernel/uapi/asm-arm64/asm/msgbuf.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/param.h b/libc/kernel/uapi/asm-arm64/asm/param.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/param.h
rename to libc/kernel/uapi/asm-arm64/asm/param.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/poll.h b/libc/kernel/uapi/asm-arm64/asm/poll.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/poll.h
rename to libc/kernel/uapi/asm-arm64/asm/poll.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/posix_types.h b/libc/kernel/uapi/asm-arm64/asm/posix_types.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/posix_types.h
rename to libc/kernel/uapi/asm-arm64/asm/posix_types.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/ptrace.h b/libc/kernel/uapi/asm-arm64/asm/ptrace.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/ptrace.h
rename to libc/kernel/uapi/asm-arm64/asm/ptrace.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/resource.h b/libc/kernel/uapi/asm-arm64/asm/resource.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/resource.h
rename to libc/kernel/uapi/asm-arm64/asm/resource.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/sembuf.h b/libc/kernel/uapi/asm-arm64/asm/sembuf.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/sembuf.h
rename to libc/kernel/uapi/asm-arm64/asm/sembuf.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/setup.h b/libc/kernel/uapi/asm-arm64/asm/setup.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/setup.h
rename to libc/kernel/uapi/asm-arm64/asm/setup.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/shmbuf.h b/libc/kernel/uapi/asm-arm64/asm/shmbuf.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/shmbuf.h
rename to libc/kernel/uapi/asm-arm64/asm/shmbuf.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/sigcontext.h b/libc/kernel/uapi/asm-arm64/asm/sigcontext.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/sigcontext.h
rename to libc/kernel/uapi/asm-arm64/asm/sigcontext.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/siginfo.h b/libc/kernel/uapi/asm-arm64/asm/siginfo.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/siginfo.h
rename to libc/kernel/uapi/asm-arm64/asm/siginfo.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/signal.h b/libc/kernel/uapi/asm-arm64/asm/signal.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/signal.h
rename to libc/kernel/uapi/asm-arm64/asm/signal.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/socket.h b/libc/kernel/uapi/asm-arm64/asm/socket.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/socket.h
rename to libc/kernel/uapi/asm-arm64/asm/socket.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/sockios.h b/libc/kernel/uapi/asm-arm64/asm/sockios.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/sockios.h
rename to libc/kernel/uapi/asm-arm64/asm/sockios.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/stat.h b/libc/kernel/uapi/asm-arm64/asm/stat.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/stat.h
rename to libc/kernel/uapi/asm-arm64/asm/stat.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/statfs.h b/libc/kernel/uapi/asm-arm64/asm/statfs.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/statfs.h
rename to libc/kernel/uapi/asm-arm64/asm/statfs.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/swab.h b/libc/kernel/uapi/asm-arm64/asm/swab.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/swab.h
rename to libc/kernel/uapi/asm-arm64/asm/swab.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/termbits.h b/libc/kernel/uapi/asm-arm64/asm/termbits.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/termbits.h
rename to libc/kernel/uapi/asm-arm64/asm/termbits.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/termios.h b/libc/kernel/uapi/asm-arm64/asm/termios.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/termios.h
rename to libc/kernel/uapi/asm-arm64/asm/termios.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/types.h b/libc/kernel/uapi/asm-arm64/asm/types.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/types.h
rename to libc/kernel/uapi/asm-arm64/asm/types.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/unistd.h b/libc/kernel/uapi/asm-arm64/asm/unistd.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/unistd.h
rename to libc/kernel/uapi/asm-arm64/asm/unistd.h
diff --git a/libc/private/bionic_atomic_aarch64.h b/libc/private/bionic_atomic_arm64.h
similarity index 100%
rename from libc/private/bionic_atomic_aarch64.h
rename to libc/private/bionic_atomic_arm64.h
diff --git a/libc/private/bionic_atomic_inline.h b/libc/private/bionic_atomic_inline.h
index c887e5a..b834a27 100644
--- a/libc/private/bionic_atomic_inline.h
+++ b/libc/private/bionic_atomic_inline.h
@@ -44,10 +44,10 @@
  */
 #define  __ATOMIC_INLINE__  static __inline__ __attribute__((always_inline))
 
-#if defined(__aarch64__)
-#  include "bionic_atomic_aarch64.h"
-#elif defined(__arm__)
+#if defined(__arm__)
 #  include "bionic_atomic_arm.h"
+#elif defined(__aarch64__)
+#  include "bionic_atomic_arm64.h"
 #elif defined(__i386__)
 #  include "bionic_atomic_x86.h"
 #elif defined(__mips__)
diff --git a/libc/tools/bionic_utils.py b/libc/tools/bionic_utils.py
index 39dc76a..88ddd55 100644
--- a/libc/tools/bionic_utils.py
+++ b/libc/tools/bionic_utils.py
@@ -2,7 +2,7 @@
 
 import sys, os, commands, string
 
-all_arches = [ "aarch64", "arm", "mips", "x86", "x86_64" ]
+all_arches = [ "arm", "arm64", "mips", "x86", "x86_64" ]
 
 # basic debugging trace support
 # call D_setlevel to set the verbosity level
diff --git a/libc/tools/gensyscalls.py b/libc/tools/gensyscalls.py
index 7b1afbb..cea3508 100755
--- a/libc/tools/gensyscalls.py
+++ b/libc/tools/gensyscalls.py
@@ -54,29 +54,6 @@
 
 
 #
-# AArch64 assembler templates for each syscall stub
-#
-
-aarch64_call = syscall_stub_header + """\
-    stp     x29, x30, [sp, #-16]!
-    mov     x29,  sp
-    str     x8,       [sp, #-16]!
-
-    mov     x8, %(__NR_name)s
-    svc     #0
-
-    ldr     x8,       [sp], #16
-    ldp     x29, x30, [sp], #16
-
-    cmn     x0, #(MAX_ERRNO + 1)
-    cneg    x0, x0, hi
-    b.hi    __set_errno
-
-    ret
-END(%(func)s)
-"""
-
-#
 # ARM assembler templates for each syscall stub
 #
 
@@ -114,6 +91,30 @@
 
 
 #
+# Arm64 assembler templates for each syscall stub
+#
+
+arm64_call = syscall_stub_header + """\
+    stp     x29, x30, [sp, #-16]!
+    mov     x29,  sp
+    str     x8,       [sp, #-16]!
+
+    mov     x8, %(__NR_name)s
+    svc     #0
+
+    ldr     x8,       [sp], #16
+    ldp     x29, x30, [sp], #16
+
+    cmn     x0, #(MAX_ERRNO + 1)
+    cneg    x0, x0, hi
+    b.hi    __set_errno
+
+    ret
+END(%(func)s)
+"""
+
+
+#
 # MIPS assembler templates for each syscall stub
 #
 
@@ -272,10 +273,6 @@
     return stub
 
 
-def aarch64_genstub(syscall):
-    return aarch64_call % syscall
-
-
 def arm_eabi_genstub(syscall):
     num_regs = count_arm_param_registers(syscall["params"])
     if num_regs > 4:
@@ -283,6 +280,10 @@
     return arm_eabi_call_default % syscall
 
 
+def arm64_genstub(syscall):
+    return arm64_call % syscall
+
+
 def mips_genstub(syscall):
     return mips_call % syscall
 
@@ -377,12 +378,12 @@
         for syscall in self.syscalls:
             syscall["__NR_name"] = make__NR_name(syscall["name"])
 
-            if syscall.has_key("aarch64"):
-                syscall["asm-aarch64"] = add_footer(64, aarch64_genstub(syscall), syscall)
-
             if syscall.has_key("arm"):
                 syscall["asm-arm"] = add_footer(32, arm_eabi_genstub(syscall), syscall)
 
+            if syscall.has_key("arm64"):
+                syscall["asm-arm64"] = add_footer(64, arm64_genstub(syscall), syscall)
+
             if syscall.has_key("x86"):
                 if syscall["socketcall_id"] >= 0:
                     syscall["asm-x86"] = add_footer(32, x86_genstub_socketcall(syscall), syscall)
diff --git a/libm/Android.mk b/libm/Android.mk
index 1c3d393..ce98236 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -225,12 +225,12 @@
 
 libm_common_includes := $(LOCAL_PATH)/upstream-freebsd/lib/msun/src/
 
-libm_aarch64_includes := $(LOCAL_PATH)/aarch64
-libm_aarch64_src_files := aarch64/fenv.c
-
 libm_arm_includes := $(LOCAL_PATH)/arm
 libm_arm_src_files := arm/fenv.c
 
+libm_arm64_includes := $(LOCAL_PATH)/arm64
+libm_arm64_src_files := arm64/fenv.c
+
 libm_x86_includes := $(LOCAL_PATH)/i386 $(LOCAL_PATH)/i387
 libm_x86_src_files := i387/fenv.c
 
diff --git a/libm/aarch64/_fpmath.h b/libm/arm64/_fpmath.h
similarity index 100%
rename from libm/aarch64/_fpmath.h
rename to libm/arm64/_fpmath.h
diff --git a/libm/aarch64/fenv.c b/libm/arm64/fenv.c
similarity index 100%
rename from libm/aarch64/fenv.c
rename to libm/arm64/fenv.c
diff --git a/libm/include/aarch64/fenv.h b/libm/include/arm64/fenv.h
similarity index 100%
rename from libm/include/aarch64/fenv.h
rename to libm/include/arm64/fenv.h
diff --git a/linker/arch/aarch64/begin.S b/linker/arch/arm64/begin.S
similarity index 100%
rename from linker/arch/aarch64/begin.S
rename to linker/arch/arm64/begin.S
diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index 8501ad6..1e9d9bc 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -184,7 +184,7 @@
 #  define ANDROID_LIBDL_STRTAB \
     "dlopen\0dlclose\0dlsym\0dlerror\0dladdr\0android_update_LD_LIBRARY_PATH\0android_get_LD_LIBRARY_PATH\0dl_iterate_phdr\0"
 #else
-#  error Unsupported architecture. Only aarch64, arm, mips, x86, and x86_64 are presently supported.
+#  error Unsupported architecture. Only arm, arm64, mips, x86, and x86_64 are presently supported.
 #endif
 
 static Elf_Sym gLibDlSymtab[] = {
diff --git a/tests/Android.mk b/tests/Android.mk
index 0540400..4985643 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -29,10 +29,10 @@
     -Werror \
     -fno-builtin \
 
-ifeq ($(TARGET_ARCH),aarch64)
+ifeq ($(TARGET_ARCH),arm64)
   $(info TODO: $(LOCAL_PATH)/Android.mk -fstack-protector not yet available for the AArch64 toolchain)
   test_c_flags += -fno-stack-protector
-endif # aarch64
+endif # arm64
 
 test_src_files = \
     buffer_tests.cpp \