about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/kernel-features.h12
2 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 619e434454..3ac4f45071 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-07-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x030f00] (__ASSUME_PSELECT): Do not
+	undefine.
+	[__LINUX_KERNEL_VERSION >= 0x030f00] (__ASSUME_PREADV): Likewise.
+	[__LINUX_KERNEL_VERSION >= 0x030f00] (__ASSUME_PWRITEV): Likewise.
+
 2014-07-01  Roland McGrath <roland@hack.frob.com>
 
 	* sysdeps/unix/sysv/linux/microblaze/arch-fork.h: New file.
diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
index 066c12dd4a..34b0521ffa 100644
--- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
@@ -45,8 +45,10 @@
 # undef __ASSUME_SET_ROBUST_LIST
 #endif
 
-/* The MicroBlaze kernel does not support the pselect6, preadv and
-   pwritev syscalls.  */
-#undef __ASSUME_PSELECT
-#undef __ASSUME_PREADV
-#undef __ASSUME_PWRITEV
+/* Support for the pselect6, preadv and pwritev syscalls was added in
+   3.15.  */
+#if __LINUX_KERNEL_VERSION < 0x030f00
+# undef __ASSUME_PSELECT
+# undef __ASSUME_PREADV
+# undef __ASSUME_PWRITEV
+#endif