diff options
18 files changed, 124 insertions, 174 deletions
@@ -1,3 +1,90 @@ +2016-03-15 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/unix/sysv/linux/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Define unconditionally. + (__ASSUME_ACCEPT4): Likewise. + [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL): + Define. + [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG): + Likewise. + [__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL): + Likewise. + [__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG): + Likewise. + * sysdeps/unix/sysv/linux/aarch64/kernel-features.h: Remove file. + * sysdeps/unix/sysv/linux/nios2/kernel-features.h: Likewise. + * sysdeps/unix/sysv/linux/alpha/kernel-features.h + (__ASSUME_RECVMMSG_SYSCALL): Do not define. + (__ASSUME_ACCEPT4_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + * sysdeps/unix/sysv/linux/arm/kernel-features.h + (__ASSUME_RECVMMSG_SYSCALL): Likewise. + (__ASSUME_ACCEPT4_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + * sysdeps/unix/sysv/linux/hppa/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Likewise. + (__ASSUME_RECVMMSG_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + * sysdeps/unix/sysv/linux/i386/kernel-features.h + [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL): + Likewise. + [__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL): + Likewise. + (__ASSUME_ACCEPT4_SYSCALL): Undefine if [__LINUX_KERNEL_VERSION < + 0x040300] instead of defining if [__LINUX_KERNEL_VERSION >= + 0x040300]. + * sysdeps/unix/sysv/linux/ia64/kernel-features.h + (__ASSUME_RECVMMSG_SYSCALL): Do not define. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + (__ASSUME_ACCEPT4_SYSCALL): Undefine if [__LINUX_KERNEL_VERSION < + 0x030300] instead of defining if [__LINUX_KERNEL_VERSION >= + 0x030300]. + [__LINUX_KERNEL_VERSION < 0x030300] (__ASSUME_ACCEPT4): Undefine. + * sysdeps/unix/sysv/linux/m68k/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Undefine if [__LINUX_KERNEL_VERSION < + 0x040300] instead of defining if [__LINUX_KERNEL_VERSION >= + 0x040300]. + (__ASSUME_RECVMMSG_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + * sysdeps/unix/sysv/linux/microblaze/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Do not define. + (__ASSUME_RECVMMSG_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Undefine if [__LINUX_KERNEL_VERSION < + 0x030300] instead of defining if [__LINUX_KERNEL_VERSION >= + 0x030300]. + * sysdeps/unix/sysv/linux/mips/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Do not define. + (__ASSUME_RECVMMSG_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + * sysdeps/unix/sysv/linux/powerpc/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Likewise. + (__ASSUME_RECVMMSG_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + * sysdeps/unix/sysv/linux/s390/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Undefine if [__LINUX_KERNEL_VERSION < + 0x040300] instead of defining if [__LINUX_KERNEL_VERSION >= + 0x040300]. + (__ASSUME_RECVMMSG_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + * sysdeps/unix/sysv/linux/sh/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Do not define. + (__ASSUME_RECVMMSG_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + * sysdeps/unix/sysv/linux/sparc/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Likewise. + (__ASSUME_RECVMMSG_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + * sysdeps/unix/sysv/linux/tile/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Likewise. + (__ASSUME_RECVMMSG_SYSCALL): Likewise. + (__ASSUME_SENDMMSG_SYSCALL): Likewise. + * sysdeps/unix/sysv/linux/x86_64/kernel-features.h + (__ASSUME_ACCEPT4_SYSCALL): Likewise. + [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL): + Likewise. + [__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL): + Likewise. + 2016-03-15 Andreas Schwab <schwab@suse.de> [BZ #19257] diff --git a/sysdeps/unix/sysv/linux/aarch64/kernel-features.h b/sysdeps/unix/sysv/linux/aarch64/kernel-features.h deleted file mode 100644 index 556ba733aa..0000000000 --- a/sysdeps/unix/sysv/linux/aarch64/kernel-features.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Set flags signalling availability of kernel features based on given - kernel version number. - - Copyright (C) 2009-2016 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <linux/version.h> - -/* AArch64 support starts with 3.7.0, guaranteeing many kernel - features. */ - -#define __ASSUME_ACCEPT4_SYSCALL 1 -#define __ASSUME_RECVMMSG_SYSCALL 1 -#define __ASSUME_SENDMMSG_SYSCALL 1 - -#include_next <kernel-features.h> diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h index d7a29db461..732749e845 100644 --- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h +++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h @@ -20,13 +20,6 @@ #ifndef _KERNEL_FEATURES_H #define _KERNEL_FEATURES_H 1 -/* Support for recvmmsg was added for alpha in 2.6.33. */ -#define __ASSUME_RECVMMSG_SYSCALL 1 - -/* Support for accept4 and sendmmsg was added for alpha in 3.2. */ -#define __ASSUME_ACCEPT4_SYSCALL 1 -#define __ASSUME_SENDMMSG_SYSCALL 1 - #include_next <kernel-features.h> #undef __ASSUME_ST_INO_64_BIT diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h index a97d4e23df..c04c4e2a02 100644 --- a/sysdeps/unix/sysv/linux/arm/kernel-features.h +++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h @@ -17,15 +17,6 @@ License along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ -/* Support for the recvmmsg syscall was added in 2.6.33. */ -#define __ASSUME_RECVMMSG_SYSCALL 1 - -/* Support for the accept4 syscall was added in 2.6.36. */ -#define __ASSUME_ACCEPT4_SYSCALL 1 - -/* Support for the sendmmsg syscall was added in 3.0. */ -#define __ASSUME_SENDMMSG_SYSCALL 1 - #include_next <kernel-features.h> /* The ARM kernel before 3.14.3 may or may not support diff --git a/sysdeps/unix/sysv/linux/hppa/kernel-features.h b/sysdeps/unix/sysv/linux/hppa/kernel-features.h index d0b489371e..f861027311 100644 --- a/sysdeps/unix/sysv/linux/hppa/kernel-features.h +++ b/sysdeps/unix/sysv/linux/hppa/kernel-features.h @@ -18,13 +18,6 @@ <http://www.gnu.org/licenses/>. */ -/* Support for the accept4 and recvmmsg syscalls was added in 2.6.34. */ -#define __ASSUME_ACCEPT4_SYSCALL 1 -#define __ASSUME_RECVMMSG_SYSCALL 1 - -/* Support for the sendmmsg syscall was added in 3.1. */ -#define __ASSUME_SENDMMSG_SYSCALL 1 - /* Support for the utimes syscall was added in 3.14. */ #if __LINUX_KERNEL_VERSION >= 0x030e00 # define __ASSUME_UTIMES 1 diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h index 4f5e0a4cc9..45054f85b1 100644 --- a/sysdeps/unix/sysv/linux/i386/kernel-features.h +++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h @@ -21,15 +21,9 @@ #define __ASSUME_SOCKETCALL 1 /* The recvmmsg syscall was added for i386 in 2.6.33. */ -#if __LINUX_KERNEL_VERSION >= 0x020621 -# define __ASSUME_RECVMMSG_SYSCALL 1 -#endif #define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1 /* The sendmmsg syscall was added for i386 in 3.0. */ -#if __LINUX_KERNEL_VERSION >= 0x030000 -# define __ASSUME_SENDMMSG_SYSCALL 1 -#endif #define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1 /* Direct socketcalls available with kernel 4.3. */ @@ -39,7 +33,6 @@ # define __ASSUME_BIND_SYSCALL 1 # define __ASSUME_CONNECT_SYSCALL 1 # define __ASSUME_LISTEN_SYSCALL 1 -# define __ASSUME_ACCEPT4_SYSCALL 1 # define __ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL 1 # define __ASSUME_GETSOCKOPT_SYSCALL 1 # define __ASSUME_SETSOCKOPT_SYSCALL 1 @@ -55,3 +48,7 @@ #endif #include_next <kernel-features.h> + +#if __LINUX_KERNEL_VERSION < 0x040300 +# undef __ASSUME_ACCEPT4_SYSCALL +#endif diff --git a/sysdeps/unix/sysv/linux/ia64/kernel-features.h b/sysdeps/unix/sysv/linux/ia64/kernel-features.h index b238322418..c0c936b95b 100644 --- a/sysdeps/unix/sysv/linux/ia64/kernel-features.h +++ b/sysdeps/unix/sysv/linux/ia64/kernel-features.h @@ -20,17 +20,12 @@ #ifndef _KERNEL_FEATURES_H #define _KERNEL_FEATURES_H 1 -/* Support for the recvmmsg syscall was added in 2.6.33. */ -#define __ASSUME_RECVMMSG_SYSCALL 1 - -/* Support for the sendmmsg syscall was added in 3.0. */ -#define __ASSUME_SENDMMSG_SYSCALL 1 +#include_next <kernel-features.h> /* Support for the accept4 syscall was added in 3.3. */ -#if __LINUX_KERNEL_VERSION >= 0x030300 -# define __ASSUME_ACCEPT4_SYSCALL 1 +#if __LINUX_KERNEL_VERSION < 0x030300 +# undef __ASSUME_ACCEPT4_SYSCALL +# undef __ASSUME_ACCEPT4 #endif -#include_next <kernel-features.h> - #endif /* _KERNEL_FEATURES_H */ diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 9832f41167..4411503cb2 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -106,10 +106,8 @@ #ifdef __ASSUME_SOCKETCALL # define __ASSUME_ACCEPT4_SOCKETCALL 1 #endif - -#if defined __ASSUME_ACCEPT4_SOCKETCALL || defined __ASSUME_ACCEPT4_SYSCALL -# define __ASSUME_ACCEPT4 1 -#endif +#define __ASSUME_ACCEPT4_SYSCALL 1 +#define __ASSUME_ACCEPT4 1 /* Support for the FUTEX_CLOCK_REALTIME flag was added in 2.6.29. */ #define __ASSUME_FUTEX_CLOCK_REALTIME 1 @@ -125,11 +123,11 @@ /* Support for recvmmsg functionality was added in 2.6.33. The macros defined correspond to those for accept4. */ -#if __LINUX_KERNEL_VERSION >= 0x020621 && defined __ASSUME_SOCKETCALL -# define __ASSUME_RECVMMSG_SOCKETCALL 1 -#endif - -#if defined __ASSUME_RECVMMSG_SOCKETCALL || defined __ASSUME_RECVMMSG_SYSCALL +#if __LINUX_KERNEL_VERSION >= 0x020621 +# ifdef __ASSUME_SOCKETCALL +# define __ASSUME_RECVMMSG_SOCKETCALL 1 +# endif +# define __ASSUME_RECVMMSG_SYSCALL 1 # define __ASSUME_RECVMMSG 1 #endif @@ -151,10 +149,10 @@ /* Support for sendmmsg functionality was added in 3.0. The macros defined correspond to those for accept4 and recvmmsg. */ -#if __LINUX_KERNEL_VERSION >= 0x030000 && defined __ASSUME_SOCKETCALL -# define __ASSUME_SENDMMSG_SOCKETCALL 1 -#endif - -#if defined __ASSUME_SENDMMSG_SOCKETCALL || defined __ASSUME_SENDMMSG_SYSCALL +#if __LINUX_KERNEL_VERSION >= 0x030000 +# ifdef __ASSUME_SOCKETCALL +# define __ASSUME_SENDMMSG_SOCKETCALL 1 +# endif +# define __ASSUME_SENDMMSG_SYSCALL 1 # define __ASSUME_SENDMMSG 1 #endif diff --git a/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h index 7bce07e204..646bc4b680 100644 --- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h +++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h @@ -22,14 +22,11 @@ /* Direct socketcalls available with kernel 4.3. */ #if __LINUX_KERNEL_VERSION >= 0x040300 -# define __ASSUME_RECVMMSG_SYSCALL 1 -# define __ASSUME_SENDMMSG_SYSCALL 1 # define __ASSUME_SOCKET_SYSCALL 1 # define __ASSUME_SOCKETPAIR_SYSCALL 1 # define __ASSUME_BIND_SYSCALL 1 # define __ASSUME_CONNECT_SYSCALL 1 # define __ASSUME_LISTEN_SYSCALL 1 -# define __ASSUME_ACCEPT4_SYSCALL 1 # define __ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL 1 # define __ASSUME_GETSOCKOPT_SYSCALL 1 # define __ASSUME_SETSOCKOPT_SYSCALL 1 @@ -46,6 +43,12 @@ #include_next <kernel-features.h> +#if __LINUX_KERNEL_VERSION < 0x040300 +# undef __ASSUME_ACCEPT4_SYSCALL +# undef __ASSUME_RECVMMSG_SYSCALL +# undef __ASSUME_SENDMMSG_SYSCALL +#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 8757b5aa87..3938989f88 100644 --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h @@ -39,15 +39,8 @@ #define __ASSUME_RECVMSG_SYSCALL 1 /* Support for the accept4 and recvmmsg syscalls was added in 2.6.33. */ -#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. */ -#if __LINUX_KERNEL_VERSION >= 0x030300 -# define __ASSUME_SENDMMSG_SYSCALL 1 -#endif - /* Support for the futimesat syscall was added in 2.6.33. */ #define __ASSUME_FUTIMESAT 1 @@ -60,3 +53,8 @@ # undef __ASSUME_PREADV # undef __ASSUME_PWRITEV #endif + +/* Support for the sendmmsg syscall was added in 3.3. */ +#if __LINUX_KERNEL_VERSION < 0x030300 +# undef __ASSUME_SENDMMSG_SYSCALL +#endif diff --git a/sysdeps/unix/sysv/linux/mips/kernel-features.h b/sysdeps/unix/sysv/linux/mips/kernel-features.h index 702c357317..7f8c98a4da 100644 --- a/sysdeps/unix/sysv/linux/mips/kernel-features.h +++ b/sysdeps/unix/sysv/linux/mips/kernel-features.h @@ -19,15 +19,6 @@ #include <sgidefs.h> -/* Support for the accept4 syscall was added in 2.6.31. */ -#define __ASSUME_ACCEPT4_SYSCALL 1 - -/* Support for the recvmmsg syscall was added in 2.6.33. */ -#define __ASSUME_RECVMMSG_SYSCALL 1 - -/* Support for the sendmmsg syscall was added in 3.1. */ -#define __ASSUME_SENDMMSG_SYSCALL 1 - #include_next <kernel-features.h> /* The MIPS kernel does not support futex_atomic_cmpxchg_inatomic if diff --git a/sysdeps/unix/sysv/linux/nios2/kernel-features.h b/sysdeps/unix/sysv/linux/nios2/kernel-features.h deleted file mode 100644 index c90df5da2a..0000000000 --- a/sysdeps/unix/sysv/linux/nios2/kernel-features.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Set flags signalling availability of kernel features based on given - kernel version number. - - Copyright (C) 2009-2016 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <linux/version.h> - -/* The minimum supported kernel version for Nios II is 3.19.0, - guaranteeing many kernel features. */ - -#define __ASSUME_ACCEPT4_SYSCALL 1 -#define __ASSUME_RECVMMSG_SYSCALL 1 -#define __ASSUME_SENDMMSG_SYSCALL 1 - -#include_next <kernel-features.h> diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h index fa3e7ef111..171c030b03 100644 --- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h @@ -20,12 +20,6 @@ /* PowerPC uses socketcall. */ #define __ASSUME_SOCKETCALL 1 -/* The accept4 syscall was added for PowerPC in 2.6.37. */ -#define __ASSUME_ACCEPT4_SYSCALL 1 - -/* The recvmmsg syscall was added for PowerPC in 2.6.37. */ -#define __ASSUME_RECVMMSG_SYSCALL 1 - /* New syscalls added for PowerPC in 2.6.37. */ #define __ASSUME_SOCKET_SYSCALL 1 #define __ASSUME_BIND_SYSCALL 1 @@ -46,7 +40,6 @@ #define __ASSUME_RECVMSG_SYSCALL 1 /* The sendmmsg syscall was added for PowerPC in 3.0. */ -#define __ASSUME_SENDMMSG_SYSCALL 1 #define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1 #include_next <kernel-features.h> diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h index b810542489..a6f131be06 100644 --- a/sysdeps/unix/sysv/linux/s390/kernel-features.h +++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h @@ -22,14 +22,11 @@ /* Direct socketcalls available with kernel 4.3. */ #if __LINUX_KERNEL_VERSION >= 0x040300 -# define __ASSUME_RECVMMSG_SYSCALL 1 -# define __ASSUME_SENDMMSG_SYSCALL 1 # define __ASSUME_SOCKET_SYSCALL 1 # define __ASSUME_SOCKETPAIR_SYSCALL 1 # define __ASSUME_BIND_SYSCALL 1 # define __ASSUME_CONNECT_SYSCALL 1 # define __ASSUME_LISTEN_SYSCALL 1 -# define __ASSUME_ACCEPT4_SYSCALL 1 # define __ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL 1 # define __ASSUME_GETSOCKOPT_SYSCALL 1 # define __ASSUME_SETSOCKOPT_SYSCALL 1 @@ -45,3 +42,9 @@ #endif #include_next <kernel-features.h> + +#if __LINUX_KERNEL_VERSION < 0x040300 +# undef __ASSUME_ACCEPT4_SYSCALL +# undef __ASSUME_RECVMMSG_SYSCALL +# undef __ASSUME_SENDMMSG_SYSCALL +#endif diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h index f9bc6f2324..9b4d1c2b2c 100644 --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h @@ -39,14 +39,7 @@ #define __ASSUME_SENDMSG_SYSCALL 1 #define __ASSUME_RECVMSG_SYSCALL 1 -/* The accept4 syscall was added for SH in 2.6.37. */ -#define __ASSUME_ACCEPT4_SYSCALL 1 - -/* The recvmmsg syscall was added for SH in 2.6.37. */ -#define __ASSUME_RECVMMSG_SYSCALL 1 - /* The sendmmsg syscall was added for SH in 3.0. */ -#define __ASSUME_SENDMMSG_SYSCALL 1 #define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1 #include_next <kernel-features.h> diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h index 3a7baa7f08..386f2304d1 100644 --- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h @@ -21,15 +21,12 @@ #define __ASSUME_SOCKETCALL 1 /* The accept4 syscall was added for SPARC in 2.6.28. */ -#define __ASSUME_ACCEPT4_SYSCALL 1 #define __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL 1 /* The recvmmsg syscall was added for SPARC in 2.6.33. */ -#define __ASSUME_RECVMMSG_SYSCALL 1 #define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1 /* The sendmmsg syscall was added for SPARC in 3.0. */ -#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 4c48c67ae0..7511f7770a 100644 --- a/sysdeps/unix/sysv/linux/tile/kernel-features.h +++ b/sysdeps/unix/sysv/linux/tile/kernel-features.h @@ -17,13 +17,6 @@ <http://www.gnu.org/licenses/>. */ -/* TILE glibc support starts with 2.6.36, guaranteeing many kernel features. */ -#define __ASSUME_ACCEPT4_SYSCALL 1 -#define __ASSUME_RECVMMSG_SYSCALL 1 - -/* Support for the sendmmsg syscall was added in 3.0. */ -#define __ASSUME_SENDMMSG_SYSCALL 1 - #include_next <kernel-features.h> /* Define this if your 32-bit syscall API requires 64-bit register diff --git a/sysdeps/unix/sysv/linux/x86_64/kernel-features.h b/sysdeps/unix/sysv/linux/x86_64/kernel-features.h index 0b84f113af..9491c3e831 100644 --- a/sysdeps/unix/sysv/linux/x86_64/kernel-features.h +++ b/sysdeps/unix/sysv/linux/x86_64/kernel-features.h @@ -17,19 +17,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* The accept4 syscall was added for x86-64 in 2.6.28. */ -#define __ASSUME_ACCEPT4_SYSCALL 1 - -/* The recvmmsg syscall was added for x86-64 in 2.6.33. */ -#if __LINUX_KERNEL_VERSION >= 0x020621 -# define __ASSUME_RECVMMSG_SYSCALL 1 -#endif - -/* The sendmmsg syscall was added for x86-64 in 3.0. */ -#if __LINUX_KERNEL_VERSION >= 0x030000 -# define __ASSUME_SENDMMSG_SYSCALL 1 -#endif - /* getcpu is a syscall for x86-64 since 3.1. */ #if __LINUX_KERNEL_VERSION >= 0x030100 # define __ASSUME_GETCPU_SYSCALL 1 |