diff options
| author | Szabolcs Nagy <nsz@port70.net> | 2015-02-07 17:25:58 +0100 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2015-02-07 11:55:00 -0500 |
| commit | e63833cd43a778f639e4fdf5d86cd5c526cc5db2 (patch) | |
| tree | 53cbec318d644db42ad04465a24c91a000de50e8 | |
| parent | 61b1d102129990f6e903c6ddcf46c7d79d1a1e99 (diff) | |
| download | musl-e63833cd43a778f639e4fdf5d86cd5c526cc5db2.tar.gz musl-e63833cd43a778f639e4fdf5d86cd5c526cc5db2.tar.bz2 musl-e63833cd43a778f639e4fdf5d86cd5c526cc5db2.tar.xz musl-e63833cd43a778f639e4fdf5d86cd5c526cc5db2.zip | |
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.
| -rw-r--r-- | arch/x86_64/bits/syscall.h | 23 | ||||
| -rw-r--r-- | src/internal/syscall.h | 3 |
2 files changed, 3 insertions, 23 deletions
diff --git a/arch/x86_64/bits/syscall.h b/arch/x86_64/bits/syscall.h index 0f9168c3..4fab41a7 100644 --- 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 b3fe7c01..e3a8c5d6 100644 --- 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 |