Skip to content

Commit

Permalink
Remove kernel-features.h conditionals on pre-3.2 kernels.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Joseph Myers committed Feb 26, 2016
1 parent de51ff8 commit ad1b6d8
Show file tree
Hide file tree
Showing 12 changed files with 100 additions and 157 deletions.
41 changes: 41 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
26 changes: 3 additions & 23 deletions sysdeps/unix/sysv/linux/alpha/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
12 changes: 3 additions & 9 deletions sysdeps/unix/sysv/linux/arm/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
15 changes: 3 additions & 12 deletions sysdeps/unix/sysv/linux/hppa/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,15 @@


/* 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
# define __ASSUME_UTIMES 1
#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
8 changes: 2 additions & 6 deletions sysdeps/unix/sysv/linux/ia64/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions sysdeps/unix/sysv/linux/m68k/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 3 additions & 19 deletions sysdeps/unix/sysv/linux/microblaze/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand All @@ -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
Expand Down
14 changes: 2 additions & 12 deletions sysdeps/unix/sysv/linux/mips/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
48 changes: 20 additions & 28 deletions sysdeps/unix/sysv/linux/powerpc/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
53 changes: 20 additions & 33 deletions sysdeps/unix/sysv/linux/sh/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 2 additions & 6 deletions sysdeps/unix/sysv/linux/sparc/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions sysdeps/unix/sysv/linux/tile/kernel-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit ad1b6d8

Please sign in to comment.