mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
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.
This commit is contained in:
@ -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
|
||||
|
Reference in New Issue
Block a user