aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-05-16 10:38:40 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-05-16 10:38:40 +0000
commit8ae9fa0ec7be4302e1a6b42f30fc207cec5c922a (patch)
treedbd8ee062dc30c53203846591721cf0bfb65b618
parent37f1c9e6b3ceb46686f3e689f2e88d43a0647742 (diff)
downloadglibc-8ae9fa0ec7be4302e1a6b42f30fc207cec5c922a.tar.xz
glibc-8ae9fa0ec7be4302e1a6b42f30fc207cec5c922a.zip
Assume accept4 on ARM for kernels 2.6.36 and later.
-rw-r--r--ChangeLog.arm5
-rw-r--r--sysdeps/unix/sysv/linux/arm/kernel-features.h7
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm
index 53359c63aa..b75bd860b4 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,8 @@
+2012-05-16 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/arm/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020624] (__ASSUME_ACCEPT4): Define.
+
2012-05-14 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/arm/sigaction.c
diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h
index 0d235e4534..644d9ff103 100644
--- a/sysdeps/unix/sysv/linux/arm/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h
@@ -1,6 +1,6 @@
/* Set flags signalling availability of kernel features based on given
kernel version number.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -56,6 +56,11 @@
# define __ASSUME_SIGNALFD4 1
#endif
+/* Support for the accept4 syscall was added in 2.6.36. */
+#if __LINUX_KERNEL_VERSION >= 0x020624
+# define __ASSUME_ACCEPT4 1
+#endif
+
#include_next <kernel-features.h>
/* Support for pselect6, ppoll and epoll_pwait was added in 2.6.32. */