diff options
| -rw-r--r-- | ChangeLog.arm | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/kernel-features.h | 8 |
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 |