buildroot
Public
Source
committed 055f1c02d35xxxxxxxxxxFrom 923e6f201b1d792cf069ca7f13c3715f4e9c9353 Mon Sep 17 00:00:00 2001From: Mike Frysinger <vapier@gentoo.org>Date: Wed, 30 May 2012 01:15:03 -0400Subject: [PATCH] pread/pwrite: handle renamed syscalls in common/ppc/xtensa codeSome arches got this fix, but many did not. So copy the ifdef logic tothe ones that missed it to fix behavior in linux-2.6+.URL: https://bugs.busybox.net/show_bug.cgi?id=5258Reported-by: David Laight <david.laight@aculab.com>Signed-off-by: Mike Frysinger <vapier@gentoo.org>--- libc/sysdeps/linux/common/pread_write.c | 12 +++++++++++- libc/sysdeps/linux/powerpc/pread_write.c | 13 +++++++++++++ libc/sysdeps/linux/xtensa/pread_write.c | 14 ++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-)diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.cindex c142038..b13de66 100644--- a/libc/sysdeps/linux/common/pread_write.c+++ b/libc/sysdeps/linux/common/pread_write.c@@ -35,6 +35,11 @@ extern __typeof(pread64) __libc_pread64; extern __typeof(pwrite64) __libc_pwrite64; #endif+#ifdef __NR_pread64 /* Newer kernels renamed but it's the same. */+# undef __NR_pread+# define __NR_pread __NR_pread64+#endif+ #include <bits/kernel_types.h> # define __NR___syscall_pread __NR_pread64@@ -64,7 +69,12 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset) weak_alias(__libc_pread64,pread64) # endif /* __UCLIBC_HAS_LFS__ */-# define __NR___syscall_pwrite __NR_pwrite64+#ifdef __NR_pwrite64 /* Newer kernels renamed but it's the same. */+# undef __NR_pwrite+# define __NR_pwrite __NR_pwrite64+#endif++# define __NR___syscall_pwrite __NR_pwrite static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, off_t, offset_hi, off_t, offset_lo)diff --git a/libc/sysdeps/linux/powerpc/pread_write.c b/libc/sysdeps/linux/powerpc/pread_write.cindex 7f988d3..23f256f 100644--- a/libc/sysdeps/linux/powerpc/pread_write.c+++ b/libc/sysdeps/linux/powerpc/pread_write.c@@ -20,6 +20,13 @@ # define off64_t off_t #endif+#ifdef __NR_pread64 /* Newer kernels renamed but it's the same. */+# ifdef __NR_pread+# error "__NR_pread and __NR_pread64 both defined???"+# endif+# define __NR_pread __NR_pread64+#endif+