diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.com> | 2015-10-21 10:03:31 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-04-11 10:08:01 -0300 |
| commit | 77a4fbd53611720cd6ae845de560df5dd332b28e (patch) | |
| tree | 234e06d90567c1e1a041974c1da6ef81cafa6a58 /sysdeps/unix/sysv/linux/pread64.c | |
| parent | eeddfa91cbb1a619af135c7a9ac14251ec094b7a (diff) | |
| download | glibc-77a4fbd53611720cd6ae845de560df5dd332b28e.tar.gz | |
Consolidate pread/pread64 implementations
This patch consolidates all the pread/pread64 implementation for Linux
in only one (sysdeps/unix/sysv/linux/pread.c). It also removes the
syscall from the auto-generation using assembly macros.
For pread{64} offset argument placement the new SYSCALL_LL{64} macro
is used. For pread ports that do not define __NR_pread will use
__NR_pread64 and for pread64 ports that dot define __NR_pread64 will
use __NR_pread for the syscall.
Checked on x86_64, x32, i386, aarch64, and ppc64le.
* sysdeps/unix/sysv/linux/arm/pread.c: Remove file.
* sysdeps/unix/sysv/linux/arm/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/pread.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c: Likewise,
* sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (pread): Remove
syscall generation.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
[__NR_pread64] (__NR_pread): Remove define.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h:
[__NR_pread64] (__NR_pread): Likewise.
* sysdeps/unix/sysv/linux/pread.c [__NR_pread64] (__NR_pread): Remove
define.
(__libc_pread): Use SYSCALL_LL macro on offset argument.
* sysdeps/unix/sysv/linux/pread64.c [__NR_pread64] (__NR_pread):
Remove define.
(__libc_pread64): Use SYSCALL_LL64 macro on offset argument.
* sysdeps/unix/sysv/linux/sh/pread.c: Rewrite using default
Linux implementation as base.
* sysdeps/unix/sysv/linux/sh/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/pread.c: Likewise.
* sysdeps/unix/sysv/linux/mips/pread64.c: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/pread64.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/pread64.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/sysdeps/unix/sysv/linux/pread64.c b/sysdeps/unix/sysv/linux/pread64.c index 7b5019ad06..c599f7664b 100644 --- a/sysdeps/unix/sysv/linux/pread64.c +++ b/sysdeps/unix/sysv/linux/pread64.c @@ -16,28 +16,25 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <errno.h> -#include <endian.h> #include <unistd.h> - #include <sysdep-cancel.h> -#include <sys/syscall.h> -#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 +#ifndef __NR_pread64 +# define __NR_pread64 __NR_pread #endif - ssize_t __libc_pread64 (int fd, void *buf, size_t count, off64_t offset) { - return SYSCALL_CANCEL (pread, fd, buf, count, - __LONG_LONG_PAIR ((off_t) (offset >> 32), - (off_t) (offset & 0xffffffff))); + return SYSCALL_CANCEL (pread64, fd, buf, count, + __ALIGNMENT_ARG SYSCALL_LL64 (offset)); } weak_alias (__libc_pread64, __pread64) weak_alias (__libc_pread64, pread64) + +#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64) +strong_alias (__libc_pread64, __libc_pread) +weak_alias (__libc_pread64, __pread) +weak_alias (__libc_pread64, pread) +#endif |