From 401c63072f7c81105a349fbf4023deb06aab1b15 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 9 Feb 2020 16:07:00 +0100 Subject: [PATCH] Linux: Clean up pread64/pwrite64 system call names Linux removed the last definitions of __NR_pread and __NR_pwrite in commit 4ba66a9760722ccbb691b8f7116cad2f791cca7b, the removal of the blackfin port. All architectures now define __NR_pread64 and __NR_pwrite64 only. --- sysdeps/unix/sysv/linux/generic/sysdep.h | 8 -------- sysdeps/unix/sysv/linux/pread.c | 6 +----- sysdeps/unix/sysv/linux/pread64.c | 4 ---- sysdeps/unix/sysv/linux/pread64_nocancel.c | 4 ---- sysdeps/unix/sysv/linux/pwrite.c | 6 +----- sysdeps/unix/sysv/linux/pwrite64.c | 4 ---- sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 11 ----------- 7 files changed, 2 insertions(+), 41 deletions(-) diff --git a/sysdeps/unix/sysv/linux/generic/sysdep.h b/sysdeps/unix/sysv/linux/generic/sysdep.h index 23defce7c3e..40b4b955ca1 100644 --- a/sysdeps/unix/sysv/linux/generic/sysdep.h +++ b/sysdeps/unix/sysv/linux/generic/sysdep.h @@ -25,11 +25,3 @@ #ifdef __NR_llseek # define __NR__llseek __NR_llseek #endif - -#if __WORDSIZE == 64 -/* By defining the older names, glibc will build syscall wrappers for - both pread and pread64; sysdeps/unix/sysv/linux/wordsize-64/pread64.c - will suppress generating any separate code for pread64.c. */ -#define __NR_pread __NR_pread64 -#define __NR_pwrite __NR_pwrite64 -#endif diff --git a/sysdeps/unix/sysv/linux/pread.c b/sysdeps/unix/sysv/linux/pread.c index 7a09affd348..8dd87b39765 100644 --- a/sysdeps/unix/sysv/linux/pread.c +++ b/sysdeps/unix/sysv/linux/pread.c @@ -21,14 +21,10 @@ #ifndef __OFF_T_MATCHES_OFF64_T -# ifndef __NR_pread -# define __NR_pread __NR_pread64 -# endif - ssize_t __libc_pread (int fd, void *buf, size_t count, off_t offset) { - return SYSCALL_CANCEL (pread, fd, buf, count, SYSCALL_LL_PRW (offset)); + return SYSCALL_CANCEL (pread64, fd, buf, count, SYSCALL_LL_PRW (offset)); } strong_alias (__libc_pread, __pread) diff --git a/sysdeps/unix/sysv/linux/pread64.c b/sysdeps/unix/sysv/linux/pread64.c index a7f907186bd..3d4ffbafc17 100644 --- a/sysdeps/unix/sysv/linux/pread64.c +++ b/sysdeps/unix/sysv/linux/pread64.c @@ -19,10 +19,6 @@ #include #include -#ifndef __NR_pread64 -# define __NR_pread64 __NR_pread -#endif - ssize_t __libc_pread64 (int fd, void *buf, size_t count, off64_t offset) { diff --git a/sysdeps/unix/sysv/linux/pread64_nocancel.c b/sysdeps/unix/sysv/linux/pread64_nocancel.c index 2eb6873e66a..af339859594 100644 --- a/sysdeps/unix/sysv/linux/pread64_nocancel.c +++ b/sysdeps/unix/sysv/linux/pread64_nocancel.c @@ -20,10 +20,6 @@ #include #include -#ifndef __NR_pread64 -# define __NR_pread64 __NR_pread -#endif - ssize_t __pread64_nocancel (int fd, void *buf, size_t count, off64_t offset) { diff --git a/sysdeps/unix/sysv/linux/pwrite.c b/sysdeps/unix/sysv/linux/pwrite.c index 5ef208e8850..17964686e57 100644 --- a/sysdeps/unix/sysv/linux/pwrite.c +++ b/sysdeps/unix/sysv/linux/pwrite.c @@ -21,14 +21,10 @@ #ifndef __OFF_T_MATCHES_OFF64_T -# ifndef __NR_pwrite -# define __NR_pwrite __NR_pwrite64 -# endif - ssize_t __libc_pwrite (int fd, const void *buf, size_t count, off_t offset) { - return SYSCALL_CANCEL (pwrite, fd, buf, count, SYSCALL_LL_PRW (offset)); + return SYSCALL_CANCEL (pwrite64, fd, buf, count, SYSCALL_LL_PRW (offset)); } strong_alias (__libc_pwrite, __pwrite) diff --git a/sysdeps/unix/sysv/linux/pwrite64.c b/sysdeps/unix/sysv/linux/pwrite64.c index 632f001f5b3..709775c2078 100644 --- a/sysdeps/unix/sysv/linux/pwrite64.c +++ b/sysdeps/unix/sysv/linux/pwrite64.c @@ -19,10 +19,6 @@ #include #include -#ifndef __NR_pwrite64 -# define __NR_pwrite64 __NR_pwrite -#endif - ssize_t __libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset) { diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h index 9ff4479dc39..cec13266622 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h @@ -39,17 +39,6 @@ /* In newer 2.1 kernels __NR_syscall is missing so we define it here. */ #define __NR_syscall 0 -/* - * Newer kernel versions redefined __NR_pread and __NR_pwrite to - * __NR_pread64 and __NR_pwrite64. - */ -#ifndef __NR_pread -# define __NR_pread __NR_pread64 -#endif -#ifndef __NR_pwrite -# define __NR_pwrite __NR_pwrite64 -#endif - #undef SYS_ify #define SYS_ify(syscall_name) __NR_##syscall_name -- 2.47.2