diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-10-21 19:29:18 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-10-24 15:26:42 -0200 |
| commit | 2152cf7edadb7673ea1e216de6fdfa658ec4ac1f (patch) | |
| tree | 99f19c124322fde43f14612ac3b77415f9d6d672 /sysdeps/unix/sysv/linux/sysdep.h | |
| parent | 93f94163018e7e79241938dff1df2e52d9cbc51d (diff) | |
| download | glibc-2152cf7edadb7673ea1e216de6fdfa658ec4ac1f.tar glibc-2152cf7edadb7673ea1e216de6fdfa658ec4ac1f.tar.gz glibc-2152cf7edadb7673ea1e216de6fdfa658ec4ac1f.tar.bz2 glibc-2152cf7edadb7673ea1e216de6fdfa658ec4ac1f.zip | |
Fix Linux sh4 pread/pwrite argument passing
Although conceptually correct for p{read,write}{64} offset argument passing,
sh4 implementation does not generate the correct expected code. The
__ALIGNMENT_ARG redefinition is incorrect for two reasons: 1. the
kernel-features.h header is included multiple times (since it contains no
guards) and 2. the value it redefines is also incorrect (should be '0, '
instead of empty definition).
This patch fixes it by adding another macro, SYSCALL_LL_PRW{64}, meant to be
used to pass the offset argument on p{read,write}64. It is basically the
already define SYSCALL_LL{64} plus __ALIGNMENT_ARG unless __ASSUME_PRW_DUMMY_ARG
is define. In this case an empty dummy argument is used regardless how
__ALIGNMENT_ARG is defined (sh4 case).
Checked on x86_64, i686, aarch64, armhf, and powerpc64le (basically a sanity
check). Also, John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> and
James Clarke <jrtc27@jrtc27.com> help me check on a debian sh4 bootstrap using
2.24 plus this patch to verify it also corrected fixed the regression issue.
I also verified the generated object for a 2.24 build and master with this
patch for sh4 and both look identical.
* sysdeps/unix/sysv/linux/pread.c (__libc_pread): Use SYSCALL_LL_PRW.
* sysdeps/unix/sysv/linux/pwrite.c (__libc_pwrite): Likewise.
* sysdeps/unix/sysv/linux/pread64.c (__libc_pread64): Use
SYSCALL_LL64_PRW.
* sysdeps/unix/sysv/linux/pwrite64.c (__libc_pwrite64): Likewise.
* sysdeps/unix/sysv/linux/sh/kernel-features.h: Define
__ASSUME_PRW_DUMMY_ARG.
* sysdeps/unix/sysv/linux/sh/pread.c: Remove file.
* sysdeps/unix/sysv/linux/sh/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/sh/pwrite.c: Likewise.
* sysdeps/unix/sysv/linux/sh/pwrite64.c: Likewise.
* sysdeps/unix/sysv/linux/sysdep.h: Define SYSCALL_LL_PRW and
SYSCALL_LL_PRW64 based on __ASSUME_PRW_DUMMY_ARG.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sysdep.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sysdep.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/sysdep.h b/sysdeps/unix/sysv/linux/sysdep.h index a469f57121..e3ecd5638e 100644 --- a/sysdeps/unix/sysv/linux/sysdep.h +++ b/sysdeps/unix/sysv/linux/sysdep.h @@ -48,6 +48,16 @@ __LONG_LONG_PAIR ((long) ((val) >> 32), (long) ((val) & 0xffffffff)) #endif +/* Provide a common macro to pass 64-bit value on pread and pwrite + syscalls. */ +#ifdef __ASSUME_PRW_DUMMY_ARG +# define SYSCALL_LL_PRW(val) 0, SYSCALL_LL (val) +# define SYSCALL_LL64_PRW(val) 0, SYSCALL_LL64 (val) +#else +# define SYSCALL_LL_PRW(val) __ALIGNMENT_ARG SYSCALL_LL (val) +# define SYSCALL_LL64_PRW(val) __ALIGNMENT_ARG SYSCALL_LL64 (val) +#endif + /* Provide a macro to pass the off{64}_t argument on p{readv,writev}{64}. */ #define LO_HI_LONG(val) \ (long) (val), \ |