aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/utimes.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-12-22 21:42:03 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-12-22 21:42:03 +0000
commit90aa3d09450903859e2845399729775b19bde50c (patch)
treec014a8d3a79b5271ce3994750d66d6975329d8e6 /sysdeps/unix/sysv/linux/utimes.c
parent4c0c0e2aeffe050b78ab515ae54a051dc7a1e2da (diff)
downloadglibc-90aa3d09450903859e2845399729775b19bde50c.zip
glibc-90aa3d09450903859e2845399729775b19bde50c.tar.gz
glibc-90aa3d09450903859e2845399729775b19bde50c.tar.bz2
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/utimes.c')
-rw-r--r--sysdeps/unix/sysv/linux/utimes.c30
1 files changed, 3 insertions, 27 deletions
diff --git a/sysdeps/unix/sysv/linux/utimes.c b/sysdeps/unix/sysv/linux/utimes.c
index 2bcebeb..5bea069 100644
--- a/sysdeps/unix/sysv/linux/utimes.c
+++ b/sysdeps/unix/sysv/linux/utimes.c
@@ -20,40 +20,16 @@
#include <utime.h>
#include <sys/time.h>
#include <sysdep.h>
-#include <kernel-features.h>
+/* Consider moving to syscalls.list. */
+
/* Change the access time of FILE to TVP[0] and
the modification time of FILE to TVP[1]. */
int
__utimes (const char *file, const struct timeval tvp[2])
{
-#ifdef __NR_utimes
- int result = INLINE_SYSCALL (utimes, 2, file, tvp);
-# ifndef __ASSUME_UTIMES
- if (result != -1 || errno != ENOSYS)
-# endif
- return result;
-#endif
-
- /* The utimes() syscall does not exist or is not available in the
- used kernel. Use utime(). For this we have to convert to the
- data format utime() expects. */
-#ifndef __ASSUME_UTIMES
- struct utimbuf buf;
- struct utimbuf *times;
-
- if (tvp != NULL)
- {
- times = &buf;
- buf.actime = tvp[0].tv_sec + tvp[0].tv_usec / 1000000;
- buf.modtime = tvp[1].tv_sec + tvp[1].tv_usec / 1000000;
- }
- else
- times = NULL;
-
- return INLINE_SYSCALL (utime, 2, file, times);
-#endif
+ return INLINE_SYSCALL (utimes, 2, file, tvp);
}
weak_alias (__utimes, utimes)