diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-12-22 21:42:03 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-12-22 21:42:03 +0000 |
| commit | 90aa3d09450903859e2845399729775b19bde50c (patch) | |
| tree | c014a8d3a79b5271ce3994750d66d6975329d8e6 /sysdeps/unix/sysv/linux/hppa/kernel-features.h | |
| parent | 4c0c0e2aeffe050b78ab515ae54a051dc7a1e2da (diff) | |
| download | glibc-90aa3d09450903859e2845399729775b19bde50c.tar.gz glibc-90aa3d09450903859e2845399729775b19bde50c.tar.xz glibc-90aa3d09450903859e2845399729775b19bde50c.zip | |
Make __ASSUME_UTIMES hppa-specific.
This patch makes __ASSUME_UTIMES hppa-specific, removing mentions of the macro from architecture-independent code and code for other architectures. (All other architectures either have the utimes syscall in all relevant kernel versions, or use the asm-generic interface so only have utimensat and won't get the utimes syscall.) A similar approach is used to that used for futimesat for MicroBlaze: if the kernel is recent enough that the utimes syscall can be assumed to be present, use the implementation in terms of the utimes syscall, and otherwise use the linux/generic implementation in terms of utimensat. Tested x86_64 that the disassembly of installed shared libraries is unchanged by the patch. Not tested for hppa. * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_UTIMES): Do not define. * sysdeps/unix/sysv/linux/utimes.c: Do not include <kernel-features.h>. (__utimes) [__NR_utimes]: Make code unconditional. (__utimes) [!__ASSUME_UTIMES]: Remove conditional code. * sysdeps/unix/sysv/linux/aarch64/kernel-features.h (__ASSUME_UTIMES): Do not undefine. * sysdeps/unix/sysv/linux/tile/kernel-features.h (__ASSUME_UTIMES): Likewise. * sysdeps/unix/sysv/linux/hppa/kernel-features.h (__ASSUME_UTIMES): Define for [__LINUX_KERNEL_VERSION >= 0x030e00] instead of undefining for [__LINUX_KERNEL_VERSION < 0x030e00]. * sysdeps/unix/sysv/linux/hppa/utimes.c: New file.
Diffstat (limited to 'sysdeps/unix/sysv/linux/hppa/kernel-features.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/kernel-features.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/hppa/kernel-features.h b/sysdeps/unix/sysv/linux/hppa/kernel-features.h index 25c3e36600..cf0c57486f 100644 --- a/sysdeps/unix/sysv/linux/hppa/kernel-features.h +++ b/sysdeps/unix/sysv/linux/hppa/kernel-features.h @@ -32,9 +32,9 @@ # define __ASSUME_SENDMMSG_SYSCALL 1 #endif -#include_next <kernel-features.h> - -/* hppa did not get the utimes syscall until 3.14. */ -#if __LINUX_KERNEL_VERSION < 0x030e00 -# undef __ASSUME_UTIMES +/* 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> |