Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls.
(aarch64 kernels don't have these system calls.)
Change-Id: I6f64075aa412f71520f2df71c3d69b647f91c1ca
diff --git a/libc/arch-x86_64/syscalls.mk b/libc/arch-x86_64/syscalls.mk
index 44ef729..1ec3e09 100644
--- a/libc/arch-x86_64/syscalls.mk
+++ b/libc/arch-x86_64/syscalls.mk
@@ -2,12 +2,15 @@
syscall_src :=
syscall_src += arch-x86_64/syscalls/__arch_prctl.S
syscall_src += arch-x86_64/syscalls/__brk.S
-syscall_src += arch-x86_64/syscalls/__fork.S
+syscall_src += arch-x86_64/syscalls/__clone.S
+syscall_src += arch-x86_64/syscalls/__epoll_pwait.S
syscall_src += arch-x86_64/syscalls/__getcpu.S
syscall_src += arch-x86_64/syscalls/__getcwd.S
syscall_src += arch-x86_64/syscalls/__getpriority.S
syscall_src += arch-x86_64/syscalls/__ioctl.S
syscall_src += arch-x86_64/syscalls/__openat.S
+syscall_src += arch-x86_64/syscalls/__ppoll.S
+syscall_src += arch-x86_64/syscalls/__pselect6.S
syscall_src += arch-x86_64/syscalls/__ptrace.S
syscall_src += arch-x86_64/syscalls/__reboot.S
syscall_src += arch-x86_64/syscalls/__rt_sigaction.S
@@ -16,7 +19,6 @@
syscall_src += arch-x86_64/syscalls/__rt_sigsuspend.S
syscall_src += arch-x86_64/syscalls/__rt_sigtimedwait.S
syscall_src += arch-x86_64/syscalls/__sched_getaffinity.S
-syscall_src += arch-x86_64/syscalls/__sys_clone.S
syscall_src += arch-x86_64/syscalls/__syslog.S
syscall_src += arch-x86_64/syscalls/__timer_create.S
syscall_src += arch-x86_64/syscalls/__timer_delete.S
@@ -44,7 +46,6 @@
syscall_src += arch-x86_64/syscalls/dup3.S
syscall_src += arch-x86_64/syscalls/epoll_create1.S
syscall_src += arch-x86_64/syscalls/epoll_ctl.S
-syscall_src += arch-x86_64/syscalls/epoll_wait.S
syscall_src += arch-x86_64/syscalls/eventfd.S
syscall_src += arch-x86_64/syscalls/execve.S
syscall_src += arch-x86_64/syscalls/faccessat.S
@@ -118,11 +119,9 @@
syscall_src += arch-x86_64/syscalls/munlockall.S
syscall_src += arch-x86_64/syscalls/munmap.S
syscall_src += arch-x86_64/syscalls/nanosleep.S
-syscall_src += arch-x86_64/syscalls/pause.S
syscall_src += arch-x86_64/syscalls/perf_event_open.S
syscall_src += arch-x86_64/syscalls/personality.S
syscall_src += arch-x86_64/syscalls/pipe2.S
-syscall_src += arch-x86_64/syscalls/poll.S
syscall_src += arch-x86_64/syscalls/prctl.S
syscall_src += arch-x86_64/syscalls/pread64.S
syscall_src += arch-x86_64/syscalls/pwrite64.S
@@ -143,7 +142,6 @@
syscall_src += arch-x86_64/syscalls/sched_setparam.S
syscall_src += arch-x86_64/syscalls/sched_setscheduler.S
syscall_src += arch-x86_64/syscalls/sched_yield.S
-syscall_src += arch-x86_64/syscalls/select.S
syscall_src += arch-x86_64/syscalls/sendfile.S
syscall_src += arch-x86_64/syscalls/sendmsg.S
syscall_src += arch-x86_64/syscalls/sendto.S
diff --git a/libc/arch-x86_64/syscalls/__sys_clone.S b/libc/arch-x86_64/syscalls/__clone.S
similarity index 90%
rename from libc/arch-x86_64/syscalls/__sys_clone.S
rename to libc/arch-x86_64/syscalls/__clone.S
index 314440b..c10402a 100644
--- a/libc/arch-x86_64/syscalls/__sys_clone.S
+++ b/libc/arch-x86_64/syscalls/__clone.S
@@ -4,7 +4,7 @@
#include <linux/err.h>
#include <machine/asm.h>
-ENTRY(__sys_clone)
+ENTRY(__clone)
movq %rcx, %r10
movl $__NR_clone, %eax
syscall
@@ -16,4 +16,4 @@
orq $-1, %rax
1:
ret
-END(__sys_clone)
+END(__clone)
diff --git a/libc/arch-x86_64/syscalls/select.S b/libc/arch-x86_64/syscalls/__epoll_pwait.S
similarity index 79%
copy from libc/arch-x86_64/syscalls/select.S
copy to libc/arch-x86_64/syscalls/__epoll_pwait.S
index 1cea5c6..98f3465 100644
--- a/libc/arch-x86_64/syscalls/select.S
+++ b/libc/arch-x86_64/syscalls/__epoll_pwait.S
@@ -4,9 +4,9 @@
#include <linux/err.h>
#include <machine/asm.h>
-ENTRY(select)
+ENTRY(__epoll_pwait)
movq %rcx, %r10
- movl $__NR_select, %eax
+ movl $__NR_epoll_pwait, %eax
syscall
cmpq $-MAX_ERRNO, %rax
jb 1f
@@ -16,4 +16,4 @@
orq $-1, %rax
1:
ret
-END(select)
+END(__epoll_pwait)
diff --git a/libc/arch-x86_64/syscalls/__fork.S b/libc/arch-x86_64/syscalls/__fork.S
deleted file mode 100644
index dcadec3..0000000
--- a/libc/arch-x86_64/syscalls/__fork.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Generated by gensyscalls.py. Do not edit. */
-
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
-
-ENTRY(__fork)
- movl $__NR_fork, %eax
- syscall
- cmpq $-MAX_ERRNO, %rax
- jb 1f
- negl %eax
- movl %eax, %edi
- call __set_errno
- orq $-1, %rax
-1:
- ret
-END(__fork)
diff --git a/libc/arch-x86_64/syscalls/select.S b/libc/arch-x86_64/syscalls/__ppoll.S
similarity index 83%
rename from libc/arch-x86_64/syscalls/select.S
rename to libc/arch-x86_64/syscalls/__ppoll.S
index 1cea5c6..c6c055b 100644
--- a/libc/arch-x86_64/syscalls/select.S
+++ b/libc/arch-x86_64/syscalls/__ppoll.S
@@ -4,9 +4,9 @@
#include <linux/err.h>
#include <machine/asm.h>
-ENTRY(select)
+ENTRY(__ppoll)
movq %rcx, %r10
- movl $__NR_select, %eax
+ movl $__NR_ppoll, %eax
syscall
cmpq $-MAX_ERRNO, %rax
jb 1f
@@ -16,4 +16,4 @@
orq $-1, %rax
1:
ret
-END(select)
+END(__ppoll)
diff --git a/libc/arch-x86_64/syscalls/select.S b/libc/arch-x86_64/syscalls/__pselect6.S
similarity index 81%
copy from libc/arch-x86_64/syscalls/select.S
copy to libc/arch-x86_64/syscalls/__pselect6.S
index 1cea5c6..b0bb8ba 100644
--- a/libc/arch-x86_64/syscalls/select.S
+++ b/libc/arch-x86_64/syscalls/__pselect6.S
@@ -4,9 +4,9 @@
#include <linux/err.h>
#include <machine/asm.h>
-ENTRY(select)
+ENTRY(__pselect6)
movq %rcx, %r10
- movl $__NR_select, %eax
+ movl $__NR_pselect6, %eax
syscall
cmpq $-MAX_ERRNO, %rax
jb 1f
@@ -16,4 +16,4 @@
orq $-1, %rax
1:
ret
-END(select)
+END(__pselect6)
diff --git a/libc/arch-x86_64/syscalls/epoll_wait.S b/libc/arch-x86_64/syscalls/epoll_wait.S
deleted file mode 100644
index d3e6a6f..0000000
--- a/libc/arch-x86_64/syscalls/epoll_wait.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Generated by gensyscalls.py. Do not edit. */
-
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
-
-ENTRY(epoll_wait)
- movq %rcx, %r10
- movl $__NR_epoll_wait, %eax
- syscall
- cmpq $-MAX_ERRNO, %rax
- jb 1f
- negl %eax
- movl %eax, %edi
- call __set_errno
- orq $-1, %rax
-1:
- ret
-END(epoll_wait)
diff --git a/libc/arch-x86_64/syscalls/pause.S b/libc/arch-x86_64/syscalls/pause.S
deleted file mode 100644
index 9f03327..0000000
--- a/libc/arch-x86_64/syscalls/pause.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Generated by gensyscalls.py. Do not edit. */
-
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
-
-ENTRY(pause)
- movl $__NR_pause, %eax
- syscall
- cmpq $-MAX_ERRNO, %rax
- jb 1f
- negl %eax
- movl %eax, %edi
- call __set_errno
- orq $-1, %rax
-1:
- ret
-END(pause)
diff --git a/libc/arch-x86_64/syscalls/poll.S b/libc/arch-x86_64/syscalls/poll.S
deleted file mode 100644
index 48130c3..0000000
--- a/libc/arch-x86_64/syscalls/poll.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Generated by gensyscalls.py. Do not edit. */
-
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
-
-ENTRY(poll)
- movl $__NR_poll, %eax
- syscall
- cmpq $-MAX_ERRNO, %rax
- jb 1f
- negl %eax
- movl %eax, %edi
- call __set_errno
- orq $-1, %rax
-1:
- ret
-END(poll)