Remove kernel-features.h conditionals on pre-3.2 kernels.

This patch follows up on the increase in minimum kernel version by
removing conditionals in non-x86, non-x86_64 kernel-features.h headers
that are now constant for all supported kernel versions.

	* sysdeps/unix/sysv/linux/alpha/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
	[__LINUX_KERNEL_VERSION >= 0x030200]: Likewise.
	[__LINUX_KERNEL_VERSION < 0x020621]: Remove conditional code.
	* sysdeps/unix/sysv/linux/arm/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
	[__LINUX_KERNEL_VERSION >= 0x020624]: Likewise.
	[__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
	* sysdeps/unix/sysv/linux/hppa/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x020622]: Likewise.
	[__LINUX_KERNEL_VERSION >= 0x030100]: Likewise.
	[__LINUX_KERNEL_VERSION < 0x020625]: Remove conditional code.
	* sysdeps/unix/sysv/linux/ia64/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
	[__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
	* sysdeps/unix/sysv/linux/m68k/kernel-features.h
	[__LINUX_KERNEL_VERSION < 0x030000]: Remove conditional code.
	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
	[__LINUX_KERNEL_VERSION < 0x020621]: Remove conditional code.
	[__LINUX_KERNEL_VERSION < 0x020625]: Likewise.
	* sysdeps/unix/sysv/linux/mips/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
	[__LINUX_KERNEL_VERSION >= 0x030100]: Likewise.
	[_MIPS_SIM == _ABIN32 && __LINUX_KERNEL_VERSION < 0x020623]:
	Remove conditional code.
	* sysdeps/unix/sysv/linux/powerpc/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x020625]: Make code unconditional.
	[__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
	* sysdeps/unix/sysv/linux/sh/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x020625]: Likewise.
	[__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
	[__LINUX_KERNEL_VERSION < 0x020625]: Remove conditional code.
	* sysdeps/unix/sysv/linux/sparc/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
	[__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
	* sysdeps/unix/sysv/linux/tile/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.

diff --git a/ChangeLog b/ChangeLog
index ac6d44a41fd8d8e5991f2cf8fda05c201a65e86b..9dabeca5d3f6633f12caa8fbeb452a9eea9ac71f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2016-02-26  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/alpha/kernel-features.h
+       [__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
+       [__LINUX_KERNEL_VERSION >= 0x030200]: Likewise.
+       [__LINUX_KERNEL_VERSION < 0x020621]: Remove conditional code.
+       * sysdeps/unix/sysv/linux/arm/kernel-features.h
+       [__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
+       [__LINUX_KERNEL_VERSION >= 0x020624]: Likewise.
+       [__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
+       * sysdeps/unix/sysv/linux/hppa/kernel-features.h
+       [__LINUX_KERNEL_VERSION >= 0x020622]: Likewise.
+       [__LINUX_KERNEL_VERSION >= 0x030100]: Likewise.
+       [__LINUX_KERNEL_VERSION < 0x020625]: Remove conditional code.
+       * sysdeps/unix/sysv/linux/ia64/kernel-features.h
+       [__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
+       [__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
+       * sysdeps/unix/sysv/linux/m68k/kernel-features.h
+       [__LINUX_KERNEL_VERSION < 0x030000]: Remove conditional code.
+       * sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+       [__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
+       [__LINUX_KERNEL_VERSION < 0x020621]: Remove conditional code.
+       [__LINUX_KERNEL_VERSION < 0x020625]: Likewise.
+       * sysdeps/unix/sysv/linux/mips/kernel-features.h
+       [__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
+       [__LINUX_KERNEL_VERSION >= 0x030100]: Likewise.
+       [_MIPS_SIM == _ABIN32 && __LINUX_KERNEL_VERSION < 0x020623]:
+       Remove conditional code.
+       * sysdeps/unix/sysv/linux/powerpc/kernel-features.h
+       [__LINUX_KERNEL_VERSION >= 0x020625]: Make code unconditional.
+       [__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
+       * sysdeps/unix/sysv/linux/sh/kernel-features.h
+       [__LINUX_KERNEL_VERSION >= 0x020625]: Likewise.
+       [__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
+       [__LINUX_KERNEL_VERSION < 0x020625]: Remove conditional code.
+       * sysdeps/unix/sysv/linux/sparc/kernel-features.h
+       [__LINUX_KERNEL_VERSION >= 0x020621]: Make code unconditional.
+       [__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
+       * sysdeps/unix/sysv/linux/tile/kernel-features.h
+       [__LINUX_KERNEL_VERSION >= 0x030000]: Likewise.
+
 2016-02-24  Marko Myllynen  <myllynen@redhat.com>
 
        * NEWS (2.23): Fix typo in bug 19048 text.

diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
index 2cd61ecaa424f6037a4d15ecc53f3eb40e012e61..d7a29db4614aa554f74b55f7b7f34b3ed32d1097 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
@@ -21,38 +21,18 @@
 #define _KERNEL_FEATURES_H 1
 
 /* Support for recvmmsg was added for alpha in 2.6.33.  */
-#if __LINUX_KERNEL_VERSION >= 0x020621
-# define __ASSUME_RECVMMSG_SYSCALL       1
-#endif
+#define __ASSUME_RECVMMSG_SYSCALL       1
 
 /* Support for accept4 and sendmmsg was added for alpha in 3.2.  */
-#if __LINUX_KERNEL_VERSION >= 0x030200
-# define __ASSUME_ACCEPT4_SYSCALL      1
-# define __ASSUME_SENDMMSG_SYSCALL     1
-#endif
+#define __ASSUME_ACCEPT4_SYSCALL      1
+#define __ASSUME_SENDMMSG_SYSCALL     1
 
 #include_next <kernel-features.h>
 
 #undef __ASSUME_ST_INO_64_BIT
 
-/* Support for fallocate was added for alpha after 2.6.33-rc1.  */
-#if __LINUX_KERNEL_VERSION < 0x020621
-# undef __ASSUME_FALLOCATE
-#endif
-
 /* There never has been support for fstat64.  */
 #undef __ASSUME_STATFS64
 #define __ASSUME_STATFS64 0
 
-/* Support for various syscalls was added for alpha in 2.6.33.  */
-#if __LINUX_KERNEL_VERSION < 0x020621
-# undef __ASSUME_PREADV
-# undef __ASSUME_PWRITEV
-# undef __ASSUME_IN_NONBLOCK
-# undef __ASSUME_PIPE2
-# undef __ASSUME_EVENTFD2
-# undef __ASSUME_SIGNALFD4
-# undef __ASSUME_DUP3
-#endif
-
 #endif /* _KERNEL_FEATURES_H */

diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h
index 6f1606c833052dc6a95f16af440edf4b14d5e1bb..a97d4e23df6a75c6900f4146039a45f8355c9927 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h
@@ -18,19 +18,13 @@
    <http://www.gnu.org/licenses/>.  */
 
 /* Support for the recvmmsg syscall was added in 2.6.33.  */
-#if __LINUX_KERNEL_VERSION >= 0x020621
-# define __ASSUME_RECVMMSG_SYSCALL     1
-#endif
+#define __ASSUME_RECVMMSG_SYSCALL      1
 
 /* Support for the accept4 syscall was added in 2.6.36.  */
-#if __LINUX_KERNEL_VERSION >= 0x020624
-# define __ASSUME_ACCEPT4_SYSCALL      1
-#endif
+#define __ASSUME_ACCEPT4_SYSCALL       1
 
 /* Support for the sendmmsg syscall was added in 3.0.  */
-#if __LINUX_KERNEL_VERSION >= 0x030000
-# define __ASSUME_SENDMMSG_SYSCALL     1
-#endif
+#define __ASSUME_SENDMMSG_SYSCALL      1
 
 #include_next <kernel-features.h>
 

diff --git a/sysdeps/unix/sysv/linux/hppa/kernel-features.h b/sysdeps/unix/sysv/linux/hppa/kernel-features.h
index a3fcf17d53f469c1023b2c977cdf0e0ed90daa9e..d0b489371ed5791acb6c6b77450b449cbd8ed9d2 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/hppa/kernel-features.h
@@ -19,15 +19,11 @@
 
 
 /* Support for the accept4 and recvmmsg syscalls was added in 2.6.34.  */
-#if __LINUX_KERNEL_VERSION >= 0x020622
-# define __ASSUME_ACCEPT4_SYSCALL      1
-# define __ASSUME_RECVMMSG_SYSCALL     1
-#endif
+#define __ASSUME_ACCEPT4_SYSCALL       1
+#define __ASSUME_RECVMMSG_SYSCALL      1
 
 /* Support for the sendmmsg syscall was added in 3.1.  */
-#if __LINUX_KERNEL_VERSION >= 0x030100
-# define __ASSUME_SENDMMSG_SYSCALL     1
-#endif
+#define __ASSUME_SENDMMSG_SYSCALL      1
 
 /* Support for the utimes syscall was added in 3.14.  */
 #if __LINUX_KERNEL_VERSION >= 0x030e00
@@ -35,8 +31,3 @@
 #endif
 
 #include_next <kernel-features.h>
-
-/* The prlimit64 syscall was added for PA in 2.6.37.  */
-#if __LINUX_KERNEL_VERSION < 0x020625
-# undef __ASSUME_PRLIMIT64
-#endif

diff --git a/sysdeps/unix/sysv/linux/ia64/kernel-features.h b/sysdeps/unix/sysv/linux/ia64/kernel-features.h
index ec7660d491ecd4610307063d19ee89908db0fca6..b238322418adcbca775efdb41faf307da551030a 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/ia64/kernel-features.h
@@ -21,14 +21,10 @@
 #define _KERNEL_FEATURES_H 1
 
 /* Support for the recvmmsg syscall was added in 2.6.33.  */
-#if __LINUX_KERNEL_VERSION >= 0x020621
-# define __ASSUME_RECVMMSG_SYSCALL     1
-#endif
+#define __ASSUME_RECVMMSG_SYSCALL      1
 
 /* Support for the sendmmsg syscall was added in 3.0.  */
-#if __LINUX_KERNEL_VERSION >= 0x030000
-# define __ASSUME_SENDMMSG_SYSCALL     1
-#endif
+#define __ASSUME_SENDMMSG_SYSCALL      1
 
 /* Support for the accept4 syscall was added in 3.3.  */
 #if __LINUX_KERNEL_VERSION >= 0x030300

diff --git a/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
index 1b9fbc30d467ef0dabe5f52a2739f8c0380bb2b0..7bce07e204334183be069a398d6647612023e45e 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
@@ -46,12 +46,6 @@
 
 #include_next <kernel-features.h>
 
-/* These syscalls were added only in 3.0 for m68k.  */
-#if __LINUX_KERNEL_VERSION < 0x030000
-# undef __ASSUME_PSELECT
-# undef __ASSUME_PPOLL
-#endif
-
 /* No support for PI futexes or robust mutexes before 3.10 for m68k.  */
 #if __LINUX_KERNEL_VERSION < 0x030a00
 # undef __ASSUME_FUTEX_LOCK_PI

diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
index d1950ef348f1e3a5f851c89f9b9c339026b599b5..8757b5aa877ccd83efec5e5817124b129affb93f 100644 (file)
--- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
@@ -39,10 +39,8 @@
 #define __ASSUME_RECVMSG_SYSCALL       1
 
 /* Support for the accept4 and recvmmsg syscalls was added in 2.6.33.  */
-#if __LINUX_KERNEL_VERSION >= 0x020621
-# define __ASSUME_ACCEPT4_SYSCALL        1
-# define __ASSUME_RECVMMSG_SYSCALL       1
-#endif
+#define __ASSUME_ACCEPT4_SYSCALL        1
+#define __ASSUME_RECVMMSG_SYSCALL       1
 #define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL      1
 
 /* Support for the sendmmsg syscall was added in 3.3.  */
@@ -51,24 +49,10 @@
 #endif
 
 /* Support for the futimesat syscall was added in 2.6.33.  */
-#if __LINUX_KERNEL_VERSION >= 0x020621
-# define __ASSUME_FUTIMESAT              1
-#endif
+#define __ASSUME_FUTIMESAT              1
 
 #include_next <kernel-features.h>
 
-/* Support for futex_atomic_cmpxchg_inatomic was added in 2.6.33.  */
-#if __LINUX_KERNEL_VERSION < 0x020621
-# undef __ASSUME_FUTEX_LOCK_PI
-# undef __ASSUME_REQUEUE_PI
-# undef __ASSUME_SET_ROBUST_LIST
-#endif
-
-/* The prlimit64 syscall was added for MicroBlaze in 2.6.37.  */
-#if __LINUX_KERNEL_VERSION < 0x020625
-# undef __ASSUME_PRLIMIT64
-#endif
-
 /* Support for the pselect6, preadv and pwritev syscalls was added in
    3.15.  */
 #if __LINUX_KERNEL_VERSION < 0x030f00

diff --git a/sysdeps/unix/sysv/linux/mips/kernel-features.h b/sysdeps/unix/sysv/linux/mips/kernel-features.h
index 83f7a4704dbf8668dfc00fe93f75eeca099f6a7f..702c357317a33a15d293ae658097a28f2917fa23 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/mips/kernel-features.h
@@ -23,23 +23,13 @@
 #define __ASSUME_ACCEPT4_SYSCALL       1
 
 /* Support for the recvmmsg syscall was added in 2.6.33.  */
-#if __LINUX_KERNEL_VERSION >= 0x020621
-# define __ASSUME_RECVMMSG_SYSCALL     1
-#endif
+#define __ASSUME_RECVMMSG_SYSCALL      1
 
 /* Support for the sendmmsg syscall was added in 3.1.  */
-#if __LINUX_KERNEL_VERSION >= 0x030100
-# define __ASSUME_SENDMMSG_SYSCALL     1
-#endif
+#define __ASSUME_SENDMMSG_SYSCALL      1
 
 #include_next <kernel-features.h>
 
-/* The n32 syscall ABI did not have a getdents64 syscall until
-   2.6.35.  */
-#if _MIPS_SIM == _ABIN32 && __LINUX_KERNEL_VERSION < 0x020623
-# undef __ASSUME_GETDENTS64_SYSCALL
-#endif
-
 /* The MIPS kernel does not support futex_atomic_cmpxchg_inatomic if
    emulating LL/SC.  */
 #if __mips == 1 || defined _MIPS_ARCH_R5900

diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
index 14807adb27029619a807b4654c73c71b0dcca693..fa3e7ef111b3f24c178273004f172dc72c83d4b7 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
@@ -21,40 +21,32 @@
 #define __ASSUME_SOCKETCALL            1
 
 /* The accept4 syscall was added for PowerPC in 2.6.37.  */
-#if __LINUX_KERNEL_VERSION >= 0x020625
-# define __ASSUME_ACCEPT4_SYSCALL      1
-#endif
+#define __ASSUME_ACCEPT4_SYSCALL       1
 
 /* The recvmmsg syscall was added for PowerPC in 2.6.37.  */
-#if __LINUX_KERNEL_VERSION >= 0x020625
-# define __ASSUME_RECVMMSG_SYSCALL     1
-#endif
+#define __ASSUME_RECVMMSG_SYSCALL      1
 
 /* New syscalls added for PowerPC in 2.6.37.  */
-#if __LINUX_KERNEL_VERSION >= 0x020625
-# define __ASSUME_SOCKET_SYSCALL       1
-# define __ASSUME_BIND_SYSCALL         1
-# define __ASSUME_CONNECT_SYSCALL      1
-# define __ASSUME_LISTEN_SYSCALL       1
-# define __ASSUME_ACCEPT_SYSCALL       1
-# define __ASSUME_GETSOCKNAME_SYSCALL  1
-# define __ASSUME_GETPEERNAME_SYSCALL  1
-# define __ASSUME_SOCKETPAIR_SYSCALL   1
-# define __ASSUME_SEND_SYSCALL         1
-# define __ASSUME_SENDTO_SYSCALL       1
-# define __ASSUME_RECV_SYSCALL         1
-# define __ASSUME_RECVFROM_SYSCALL     1
-# define __ASSUME_SHUTDOWN_SYSCALL     1
-# define __ASSUME_GETSOCKOPT_SYSCALL   1
-# define __ASSUME_SETSOCKOPT_SYSCALL   1
-# define __ASSUME_SENDMSG_SYSCALL      1
-# define __ASSUME_RECVMSG_SYSCALL      1
-#endif
+#define __ASSUME_SOCKET_SYSCALL        1
+#define __ASSUME_BIND_SYSCALL          1
+#define __ASSUME_CONNECT_SYSCALL       1
+#define __ASSUME_LISTEN_SYSCALL                1
+#define __ASSUME_ACCEPT_SYSCALL                1
+#define __ASSUME_GETSOCKNAME_SYSCALL   1
+#define __ASSUME_GETPEERNAME_SYSCALL   1
+#define __ASSUME_SOCKETPAIR_SYSCALL    1
+#define __ASSUME_SEND_SYSCALL          1
+#define __ASSUME_SENDTO_SYSCALL                1
+#define __ASSUME_RECV_SYSCALL          1
+#define __ASSUME_RECVFROM_SYSCALL      1
+#define __ASSUME_SHUTDOWN_SYSCALL      1
+#define __ASSUME_GETSOCKOPT_SYSCALL    1
+#define __ASSUME_SETSOCKOPT_SYSCALL    1
+#define __ASSUME_SENDMSG_SYSCALL       1
+#define __ASSUME_RECVMSG_SYSCALL       1
 
 /* The sendmmsg syscall was added for PowerPC in 3.0.  */
-#if __LINUX_KERNEL_VERSION >= 0x030000
-# define __ASSUME_SENDMMSG_SYSCALL     1
-#endif
+#define __ASSUME_SENDMMSG_SYSCALL      1
 #define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL      1
 
 #include_next <kernel-features.h>

diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h
index 037d6ff0d605938450895705ab9a9664af37c04f..f9bc6f232458a2dd113be5f017d6be73dbe2f61d 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h
@@ -21,48 +21,35 @@
 #define __ASSUME_SOCKETCALL            1
 
 /* These syscalls were added for SH in 2.6.37.  */
-#if __LINUX_KERNEL_VERSION >= 0x020625
-# define __ASSUME_SOCKET_SYSCALL       1
-# define __ASSUME_BIND_SYSCALL         1
-# define __ASSUME_CONNECT_SYSCALL      1
-# define __ASSUME_LISTEN_SYSCALL       1
-# define __ASSUME_ACCEPT_SYSCALL       1
-# define __ASSUME_GETSOCKNAME_SYSCALL  1
-# define __ASSUME_GETPEERNAME_SYSCALL  1
-# define __ASSUME_SOCKETPAIR_SYSCALL   1
-# define __ASSUME_SEND_SYSCALL         1
-# define __ASSUME_SENDTO_SYSCALL       1
-# define __ASSUME_RECV_SYSCALL         1
-# define __ASSUME_RECVFROM_SYSCALL     1
-# define __ASSUME_SHUTDOWN_SYSCALL     1
-# define __ASSUME_GETSOCKOPT_SYSCALL   1
-# define __ASSUME_SETSOCKOPT_SYSCALL   1
-# define __ASSUME_SENDMSG_SYSCALL      1
-# define __ASSUME_RECVMSG_SYSCALL      1
-#endif
+#define __ASSUME_SOCKET_SYSCALL                1
+#define __ASSUME_BIND_SYSCALL          1
+#define __ASSUME_CONNECT_SYSCALL       1
+#define __ASSUME_LISTEN_SYSCALL                1
+#define __ASSUME_ACCEPT_SYSCALL                1
+#define __ASSUME_GETSOCKNAME_SYSCALL   1
+#define __ASSUME_GETPEERNAME_SYSCALL   1
+#define __ASSUME_SOCKETPAIR_SYSCALL    1
+#define __ASSUME_SEND_SYSCALL          1
+#define __ASSUME_SENDTO_SYSCALL                1
+#define __ASSUME_RECV_SYSCALL          1
+#define __ASSUME_RECVFROM_SYSCALL      1
+#define __ASSUME_SHUTDOWN_SYSCALL      1
+#define __ASSUME_GETSOCKOPT_SYSCALL    1
+#define __ASSUME_SETSOCKOPT_SYSCALL    1
+#define __ASSUME_SENDMSG_SYSCALL       1
+#define __ASSUME_RECVMSG_SYSCALL       1
 
 /* The accept4 syscall was added for SH in 2.6.37.  */
-#if __LINUX_KERNEL_VERSION >= 0x020625
-# define __ASSUME_ACCEPT4_SYSCALL      1
-#endif
+#define __ASSUME_ACCEPT4_SYSCALL       1
 
 /* The recvmmsg syscall was added for SH in 2.6.37.  */
-#if __LINUX_KERNEL_VERSION >= 0x020625
-# define __ASSUME_RECVMMSG_SYSCALL     1
-#endif
+#define __ASSUME_RECVMMSG_SYSCALL      1
 
 /* The sendmmsg syscall was added for SH in 3.0.  */
-#if __LINUX_KERNEL_VERSION >= 0x030000
-# define __ASSUME_SENDMMSG_SYSCALL     1
-#endif
+#define __ASSUME_SENDMMSG_SYSCALL      1
 #define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL      1
 
 #include_next <kernel-features.h>
 
 /* SH does not have a 64-bit inode field.  */
 #undef __ASSUME_ST_INO_64_BIT
-
-/* The prlimit64 syscall was added for SH in 2.6.37.  */
-#if __LINUX_KERNEL_VERSION < 0x020625
-# undef __ASSUME_PRLIMIT64
-#endif

diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
index abcef75852c789dc92ca432c40dc3ad5cff90887..3a7baa7f0816631f3d236e2eb856a35c50b36522 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
@@ -25,15 +25,11 @@
 #define __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL       1
 
 /* The recvmmsg syscall was added for SPARC in 2.6.33.  */
-#if __LINUX_KERNEL_VERSION >= 0x020621
-# define __ASSUME_RECVMMSG_SYSCALL     1
-#endif
+#define __ASSUME_RECVMMSG_SYSCALL      1
 #define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL      1
 
 /* The sendmmsg syscall was added for SPARC in 3.0.  */
-#if __LINUX_KERNEL_VERSION >= 0x030000
-# define __ASSUME_SENDMMSG_SYSCALL     1
-#endif
+#define __ASSUME_SENDMMSG_SYSCALL      1
 #define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL      1
 
 #include_next <kernel-features.h>

diff --git a/sysdeps/unix/sysv/linux/tile/kernel-features.h b/sysdeps/unix/sysv/linux/tile/kernel-features.h
index 5e9229585a33de7ee75823238981d0eff16e1139..4c48c67ae025eea70d4f43ea4884833b638ac3bf 100644 (file)
--- a/sysdeps/unix/sysv/linux/tile/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/tile/kernel-features.h
@@ -22,9 +22,7 @@
 #define __ASSUME_RECVMMSG_SYSCALL      1
 
 /* Support for the sendmmsg syscall was added in 3.0.  */
-#if __LINUX_KERNEL_VERSION >= 0x030000
-# define __ASSUME_SENDMMSG_SYSCALL     1
-#endif
+#define __ASSUME_SENDMMSG_SYSCALL      1
 
 #include_next <kernel-features.h>