]> git.ipfire.org Git - thirdparty/glibc.git/commit
Fix LO_HI_LONG definition
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Mon, 4 Jul 2016 14:34:35 +0000 (11:34 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Fri, 8 Jul 2016 18:41:21 +0000 (15:41 -0300)
commit468700675f7f36d55758c36b1ed902250470e8ec
tree64a677daa16b8653843e48be613a07892533788c
parent6320de95367a6d5a7849d2a2ccdd9189277fc181
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
ChangeLog
misc/tst-preadvwritev-common.c [new file with mode: 0644]
misc/tst-preadvwritev.c
misc/tst-preadvwritev64.c
sysdeps/unix/sysv/linux/sysdep.h