diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-01-13 15:24:53 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-02-06 10:21:55 -0200 |
| commit | 841a67a0ade3ea9e3d10c044524a199fa608cc7e (patch) | |
| tree | 7521fd6869a9b3c167d0a4d9db272f8a09171301 /sysdeps/unix/sysv/linux/mips | |
| parent | 58557c229319a3b8d2eefdb62e7df95089eabe37 (diff) | |
| download | glibc-841a67a0ade3ea9e3d10c044524a199fa608cc7e.tar glibc-841a67a0ade3ea9e3d10c044524a199fa608cc7e.tar.gz glibc-841a67a0ade3ea9e3d10c044524a199fa608cc7e.tar.bz2 glibc-841a67a0ade3ea9e3d10c044524a199fa608cc7e.zip | |
Consolidate arm and mips posix_fadvise implementations
As noted by c1f0601389db64d9, previous posix_fadvise consolidation
broke on mips o32. As stated in commit message, MIPS o32 only defines
__NR_fadvise64 and it is behaves like __NR_fadvise64_64.
This patches consolidates both ARM and mips o32 version by fixing
the ARM used option (__NR_fadvise64_64 withouth the alignment required
by abi) and added another option, __ASSUME_FADVISE64_AS_64_64,
which is used on mips o32.
When this option is used, posix_fadvise will use __NR_fadvise64_64
behavior (by defining or not __ASSUME_FADVISE64_64_6ARG). For
mips, if __NR_fadvise64_64 is not defined, __NR_fadvise will be used.
I also updated the posix_fadvise comments to explain better the
different kernel abi used in the supported architectures.
I checked with a mips o32 and verified that posix_fadvise.o is
indeed using 7 argument syscall with the expected argument position.
I also checked on i686-linux-gnu and arm-gnu-eabihf.
* sysdeps/unix/sysv/linux/arm/posix_fadvise.c: Remove file.
* sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c: Likewise.
* sysdeps/unix/sysv/linux/mips/kernel-features.h
(__ASSUME_FADVISE64_AS_64_64): Define.
* sysdeps/unix/sysv/linux/posix_fadvise.c [__NR_fadvise64]: Add
!defined __ASSUME_FADVISE64_AS_64_64 to use syscall issue.
[!__NR_fadvise64 && __ASSUME_FADVISE64_64_6ARG]: Remove
__ALIGNMENT_ARG usage.
[!__NR_fadvise64 && !__ASSUME_FADVISE64_64_6ARG]: Define
__NR_fadvise64_64 if it is not defined.
Diffstat (limited to 'sysdeps/unix/sysv/linux/mips')
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/kernel-features.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/mips/kernel-features.h b/sysdeps/unix/sysv/linux/mips/kernel-features.h index 83a5c8f9c9..7db5338e29 100644 --- a/sysdeps/unix/sysv/linux/mips/kernel-features.h +++ b/sysdeps/unix/sysv/linux/mips/kernel-features.h @@ -34,6 +34,9 @@ # define __ASSUME_ALIGNED_REGISTER_PAIRS 1 /* mips32 only supports ipc syscall. */ # undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS + +/* The o32 MIPS fadvise64 syscall behaves as fadvise64_64. */ +# define __ASSUME_FADVISE64_AS_64_64 1 #endif /* Define that mips64-n32 is a ILP32 ABI to set the correct interface to diff --git a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c b/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c deleted file mode 100644 index 6e9c3f9da5..0000000000 --- a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c +++ /dev/null @@ -1,4 +0,0 @@ -/* The o32 MIPS fadvise64 syscall behaves as fadvise64_64. The ARM - implementation of posix_fadvise works correctly for this case; the - generic implementation mishandles it. */ -#include <sysdeps/unix/sysv/linux/arm/posix_fadvise.c> |