remove cruft from x86_64 syscall.h

x86_64 syscall.h defined some musl internal syscall names and made
them public. These defines were already moved to src/internal/syscall.h
(except for SYS_fadvise which is added now) so the cruft in x86_64
syscall.h is not needed.

diff --git a/arch/x86_64/bits/syscall.h b/arch/x86_64/bits/syscall.h
index 0f9168c38883eb181c858e3296244bf747ea65e1..4fab41a7acc01401237e2ca771105b09a22f0f8a 100644 (file)
--- a/arch/x86_64/bits/syscall.h
+++ b/arch/x86_64/bits/syscall.h
@@ -322,17 +322,6 @@
 #define __NR_bpf                               321
 
 
-#undef __NR_fstatat
-#undef __NR_pread
-#undef __NR_pwrite
-#undef __NR_getdents
-#define __NR_fstatat __NR_newfstatat
-#define __NR_pread __NR_pread64
-#define __NR_pwrite __NR_pwrite64
-#define __NR_getdents __NR_getdents64
-#define __NR_fadvise __NR_fadvise64
-
-
 
 /* Repeat with SYS_ prefix */
 
@@ -658,15 +647,3 @@
 #define SYS_memfd_create                       319
 #define SYS_kexec_file_load                    320
 #define SYS_bpf                                        321
-
-#undef SYS_fstatat
-#undef SYS_pread
-#undef SYS_pwrite
-#undef SYS_getdents
-#define SYS_fstatat SYS_newfstatat
-#define SYS_pread SYS_pread64
-#define SYS_pwrite SYS_pwrite64
-#define SYS_getdents SYS_getdents64
-#define SYS_fadvise SYS_fadvise64
-
-

diff --git a/src/internal/syscall.h b/src/internal/syscall.h
index b3fe7c01c8f49b25330c7577d8500c0a9ef5a2d9..e3a8c5d6d43ac00f5328a2c55448b17646f8b9cb 100644 (file)
--- a/src/internal/syscall.h
+++ b/src/internal/syscall.h
@@ -191,6 +191,9 @@ long __syscall_ret(unsigned long), __syscall(syscall_arg_t, ...),
 #ifdef SYS_fadvise64_64
 #undef SYS_fadvise
 #define SYS_fadvise SYS_fadvise64_64
+#elif defined(SYS_fadvise64)
+#undef SYS_fadvise
+#define SYS_fadvise SYS_fadvise64
 #endif
 
 #ifdef SYS_sendfile64