Linux: Remove pread/pread64, pwrite/pwrite64 kludges from <sysdep.h>
diff mbox series

Message ID 87h81y2agw.fsf@oldenburg2.str.redhat.com
State New
Headers show
Series
  • Linux: Remove pread/pread64, pwrite/pwrite64 kludges from <sysdep.h>
Related show

Commit Message

Florian Weimer Dec. 18, 2019, 10:29 a.m. UTC
No changes in installed .so files (according to build-many-glibcs.py
--strip).

This patch is on top of the built-in system call list changes, but does
not actually depend on that (although there is a textual conflict on
alpha).

Thanks,
Florian
8<------------------------------------------------------------------8<

Since the switch away from auto-generated wrappers for these system
calls, the kludge is already included in the C source file of the
system call wrapper.

-----
 sysdeps/unix/sysv/linux/alpha/sysdep.h         | 10 ----------
 sysdeps/unix/sysv/linux/ia64/sysdep.h          | 10 ----------
 sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h | 10 ----------
 sysdeps/unix/sysv/linux/x86_64/sysdep.h        | 10 ----------
 4 files changed, 40 deletions(-)

Comments

Andreas Schwab Dec. 18, 2019, 10:42 a.m. UTC | #1
On Dez 18 2019, Florian Weimer wrote:

> Since the switch away from auto-generated wrappers for these system
> calls, the kludge is already included in the C source file of the
> system call wrapper.

Ok.

Andreas.

Patch
diff mbox series

diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep.h b/sysdeps/unix/sysv/linux/alpha/sysdep.h
index 4779d62689..fb1b97857b 100644
--- a/sysdeps/unix/sysv/linux/alpha/sysdep.h
+++ b/sysdeps/unix/sysv/linux/alpha/sysdep.h
@@ -37,16 +37,6 @@ 
 #undef SYS_ify
 #define SYS_ify(syscall_name)	__NR_##syscall_name
 
-/* This is a kludge to make syscalls.list find these under the names
-   pread and pwrite, since some kernel headers define those names
-   and some define the *64 names for the same system calls.  */
-#if !defined __NR_pread && defined __NR_pread64
-# define __NR_pread __NR_pread64
-#endif
-#if !defined __NR_pwrite && defined __NR_pwrite64
-# define __NR_pwrite __NR_pwrite64
-#endif
-
 #define SINGLE_THREAD_BY_GLOBAL 1
 
 #endif /* _LINUX_ALPHA_SYSDEP_H */
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index e55b2eb316..b11b0fef3f 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -46,16 +46,6 @@ 
 #undef SYS_ify
 #define SYS_ify(syscall_name)	__NR_##syscall_name
 
-/* This is a kludge to make syscalls.list find these under the names
-   pread and pwrite, since some kernel headers define those names
-   and some define the *64 names for the same system calls.  */
-#if !defined __NR_pread && defined __NR_pread64
-# define __NR_pread __NR_pread64
-#endif
-#if !defined __NR_pwrite && defined __NR_pwrite64
-# define __NR_pwrite __NR_pwrite64
-#endif
-
 /* This is to help the old kernel headers where __NR_semtimedop is not
    available.  */
 #ifndef __NR_semtimedop
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
index ebc68c63c3..c6cf4401f8 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
@@ -29,16 +29,6 @@ 
 #undef SYS_ify
 #define SYS_ify(syscall_name) __NR_##syscall_name
 
-/* This is a kludge to make syscalls.list find these under the names
-   pread and pwrite, since some kernel headers define those names
-   and some define the *64 names for the same system calls.  */
-#if !defined __NR_pread && defined __NR_pread64
-# define __NR_pread __NR_pread64
-#endif
-#if !defined __NR_pwrite && defined __NR_pwrite64
-# define __NR_pwrite __NR_pwrite64
-#endif
-
 #ifdef __ASSEMBLER__
 
 #define LOADSYSCALL(x) mov __NR_##x, %g1
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index 475b7d991a..874626f2f6 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -33,16 +33,6 @@ 
 #undef SYS_ify
 #define SYS_ify(syscall_name)	__NR_##syscall_name
 
-/* This is a kludge to make syscalls.list find these under the names
-   pread and pwrite, since some kernel headers define those names
-   and some define the *64 names for the same system calls.  */
-#if !defined __NR_pread && defined __NR_pread64
-# define __NR_pread __NR_pread64
-#endif
-#if !defined __NR_pwrite && defined __NR_pwrite64
-# define __NR_pwrite __NR_pwrite64
-#endif
-
 /* This is to help the old kernel headers where __NR_semtimedop is not
    available.  */
 #ifndef __NR_semtimedop