diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-07-04 11:34:35 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-07-08 15:41:21 -0300 |
| commit | 468700675f7f36d55758c36b1ed902250470e8ec (patch) | |
| tree | 64a677daa16b8653843e48be613a07892533788c /sysdeps/unix/sysv/linux/sysdep.h | |
| parent | 6320de95367a6d5a7849d2a2ccdd9189277fc181 (diff) | |
| download | glibc-468700675f7f36d55758c36b1ed902250470e8ec.tar.gz glibc-468700675f7f36d55758c36b1ed902250470e8ec.tar.xz glibc-468700675f7f36d55758c36b1ed902250470e8ec.zip | |
Fix LO_HI_LONG definition
The p{read,write}v{64} consolidation patch [1] added a wrong guard
for LO_HI_LONG definition. It currently uses both
'__WORDSIZE == 64' and 'defined __ASSUME_WORDSIZE64_ILP32' to set
the value to be passed in one argument, otherwise it will be split
in two.
However it fails on MIPS64n32 where syscalls n32 uses the compat
implementation in the kernel meaning the off_t arguments are passed
in two separate registers.
GLIBC already defines a macro for such cases (__OFF_T_MATCHES_OFF64_T),
so this patch uses it instead.
Checked on x86_64, i686, x32, aarch64, armhf, and s390.
* sysdeps/unix/sysv/linux/sysdep.h
[__WORDSIZE == 64 || __ASSUME_WORDSIZE64_ILP32] (LO_HI_LONG): Remove
guards.
* misc/tst-preadvwritev-common.c: New file.
* misc/tst-preadvwritev.c: Use tst-preadvwritev-common.c.
* misc/tst-preadvwritev64.c: Use tst-preadwritev-common.c and add
a check for files larger than 2GB.
[1] 4751bbe2ad4d1bfa05774e29376d553ecfe563b0
Diffstat (limited to 'sysdeps/unix/sysv/linux/sysdep.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sysdep.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/sysdep.h b/sysdeps/unix/sysv/linux/sysdep.h index 8c9e62efb0..a469f57121 100644 --- a/sysdeps/unix/sysv/linux/sysdep.h +++ b/sysdeps/unix/sysv/linux/sysdep.h @@ -49,10 +49,6 @@ #endif /* Provide a macro to pass the off{64}_t argument on p{readv,writev}{64}. */ -#if __WORDSIZE == 64 || defined __ASSUME_WORDSIZE64_ILP32 -# define LO_HI_LONG(val) (val) -#else -# define LO_HI_LONG(val) \ - (long) (val), \ - (long) (((uint64_t) (val)) >> 32) -#endif +#define LO_HI_LONG(val) \ + (long) (val), \ + (long) (((uint64_t) (val)) >> 32) |