diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-02-26 16:17:25 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-02-26 16:17:25 +0000 |
| commit | ad1b6d85ba72ce401f6bd8a785d117c9f3fde8a1 (patch) | |
| tree | a8435476ef22bb72ce8c6c5281112a8aae095001 /sysdeps/unix/sysv/linux/microblaze/kernel-features.h | |
| parent | de51ff8c0516e66554044b27656c6855a9c2ef25 (diff) | |
| download | glibc-ad1b6d85ba72ce401f6bd8a785d117c9f3fde8a1.tar.gz | |
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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/microblaze/kernel-features.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/microblaze/kernel-features.h | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h index d1950ef348..8757b5aa87 100644 --- 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 |