summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-01-12 02:19:00 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-01-12 02:19:00 +0000
commitc1f0601389db64d97b3a4580c9037d7e1c9daefb (patch)
treef0cd4edaf3965527e3fe3085385846a041e30184
parent4dfb9c941132d7b10b897c678f360fd27d6f5c95 (diff)
downloadglibc-c1f0601389db64d97b3a4580c9037d7e1c9daefb.tar.gz
Fix MIPS o32 posix_fadvise.
The posix_fadvise consolidation broke posix_fadvise for MIPS o32, so resulting in posix/tst-posix_fadvise failing. MIPS o32 (and the other ABIs) has only the posix_fadvise64 syscall, which acts like posix_fadvise64_64 (in the o32 case, because of the alignment argument it's actually a 7-argument syscall). The generic posix_fadvise implementation presumes that if __NR_fadvise64 is defined, it's for the case where a single len argument is passed to the syscall rather than two syscall arguments in the case of a 32-bit system. The generic posix_fadvise64 works fine for this case (defining __NR_fadvise64_64 to __NR_fadvise64 as needed). ARM has a posix_fadvise.c that uses __posix_fadvise64_l64 in posix_fadvise, and that approach also works for MIPS o32, so this patch makes MIPS o32 include the ARM file. Tested for MIPS o32. * sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c: New file.
-rw-r--r--ChangeLog2
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b0601fa1b..16eb52a900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2017-01-12 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c: New file.
+
* math/fgetexcptflg.c (__fegetexceptflag): Store 0 in fexcept_t
object.
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c b/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c
new file mode 100644
index 0000000000..6e9c3f9da5
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c
@@ -0,0 +1,4 @@
+/* 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>