aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2009-11-19 16:36:58 +0000
committerJoseph Myers <joseph@codesourcery.com>2009-11-19 16:36:58 +0000
commit3a2e1f4e6a8a1d5523ebae4a1b938fdaf92e94bf (patch)
treee4c2e8fb0e4b31d10735ea6eda779115b3f0bfc7
parent6add932d9099ac27762c45e344416c1ee11f6d78 (diff)
downloadglibc-3a2e1f4e6a8a1d5523ebae4a1b938fdaf92e94bf.tar.xz
glibc-3a2e1f4e6a8a1d5523ebae4a1b938fdaf92e94bf.zip
Assume pselect6 and ppoll on ARM for kernels 2.6.32 and later.
-rw-r--r--ChangeLog.arm5
-rw-r--r--sysdeps/unix/sysv/linux/arm/kernel-features.h8
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm
index a3b558b40b..e095c22c76 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,8 @@
+2009-11-19 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/arm/kernel-features.h (__ASSUME_PSELECT,
+ __ASSUME_PPOLL): Don't undefine for kernel 2.6.32 and later.
+
2009-11-18 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Change misleading
diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h
index 1b0ab63380..3996ae9c13 100644
--- a/sysdeps/unix/sysv/linux/arm/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h
@@ -59,6 +59,8 @@
#include_next <kernel-features.h>
-/* These syscalls are not implemented yet for ARM. */
-#undef __ASSUME_PSELECT
-#undef __ASSUME_PPOLL
+/* Support for pselect6, ppoll and epoll_pwait was added in 2.6.32. */
+#if __LINUX_KERNEL_VERSION < 0x020620
+# undef __ASSUME_PSELECT
+# undef __ASSUME_PPOLL
+#endif