diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/kernel-features.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/kernel-features.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/kernel-features.h | 6 |
4 files changed, 23 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index cb020262d9..a46b64ffb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2019-05-16 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/unix/sysv/linux/alpha/kernel-features.h + (__ASSUME_STATFS64): Only undefine if [__LINUX_KERNEL_VERSION < + 0x050100]. + * sysdeps/unix/sysv/linux/ia64/kernel-features.h (__ASSUME_STATX): + Likewise. + * sysdeps/unix/sysv/linux/sh/kernel-features.h + (__ASSUME_STATX): Likewise. + 2019-05-16 Florian Weimer <fweimer@redhat.com> * nis/nss_nis/nis-hosts.c (EXTRA_ARGS, EXTRA_ARGS_DECL): Remove diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h index f3298b234e..4a5d029c1d 100644 --- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h +++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h @@ -22,9 +22,11 @@ #include_next <kernel-features.h> -/* There never has been support for fstat64. */ -#undef __ASSUME_STATFS64 -#define __ASSUME_STATFS64 0 +/* Support for statfs64 was added in 5.1. */ +#if __LINUX_KERNEL_VERSION < 0x050100 +# undef __ASSUME_STATFS64 +# define __ASSUME_STATFS64 0 +#endif /* Alpha used to define SysV ipc shmat syscall with a different name. */ #ifndef __NR_shmat diff --git a/sysdeps/unix/sysv/linux/ia64/kernel-features.h b/sysdeps/unix/sysv/linux/ia64/kernel-features.h index 0f4948b8e0..333947931d 100644 --- a/sysdeps/unix/sysv/linux/ia64/kernel-features.h +++ b/sysdeps/unix/sysv/linux/ia64/kernel-features.h @@ -26,8 +26,10 @@ #define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_ACCEPT4_SYSCALL 1 -/* No statx system call on ia64 yet. */ -#undef __ASSUME_STATX +/* Support for statx was added in 5.1. */ +#if __LINUX_KERNEL_VERSION < 0x050100 +# undef __ASSUME_STATX +#endif #undef __ASSUME_CLONE_DEFAULT #define __ASSUME_CLONE2 diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h index 767df721b8..b11a5cb544 100644 --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h @@ -52,7 +52,9 @@ # undef __ASSUME_COPY_FILE_RANGE #endif -/* sh does not support the statx system call. */ -#undef __ASSUME_STATX +/* sh does not support the statx system call before 5.1. */ +#if __LINUX_KERNEL_VERSION < 0x050100 +# undef __ASSUME_STATX +#endif #endif |