diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/kernel-features.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/kernel-features.h | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/utimes.c | 30 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tile/kernel-features.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/utimes.c | 30 |
7 files changed, 55 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog index 21c1ea2a34..97eaebbb22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2014-12-22 Joseph Myers <joseph@codesourcery.com> + + * 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. + 2014-12-22 Steve Ellcey <sellcey@imgtec.com> * sysdeps/mips/memcpy.S: Fix preprocessor indentation. diff --git a/sysdeps/unix/sysv/linux/aarch64/kernel-features.h b/sysdeps/unix/sysv/linux/aarch64/kernel-features.h index bd94fe1c79..b9963e34f4 100644 --- a/sysdeps/unix/sysv/linux/aarch64/kernel-features.h +++ b/sysdeps/unix/sysv/linux/aarch64/kernel-features.h @@ -29,6 +29,3 @@ #define __ASSUME_SENDMMSG_SYSCALL 1 #include_next <kernel-features.h> - -/* asm-generic architectures do not have the utimes syscall. */ -#undef __ASSUME_UTIMES 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> diff --git a/sysdeps/unix/sysv/linux/hppa/utimes.c b/sysdeps/unix/sysv/linux/hppa/utimes.c new file mode 100644 index 0000000000..f62dd0520d --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/utimes.c @@ -0,0 +1,30 @@ +/* Implement utimes for hppa. + Copyright (C) 2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +/* hppa has the utimensat syscall in all supported kernel versions but + gained the utimes syscall later, so use the linux-generic + implementation of utimes in terms of the utimensat syscall unless + the utimes syscall is known to be available. */ + +#include <kernel-features.h> + +#ifdef __ASSUME_UTIMES +# include <sysdeps/unix/sysv/linux/utimes.c> +#else +# include <sysdeps/unix/sysv/linux/generic/utimes.c> +#endif diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 85fc2f1615..5409c53af1 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -61,12 +61,6 @@ /* The statfs64 syscalls are available in 2.5.74 (but not for alpha). */ #define __ASSUME_STATFS64 1 -/* The utimes syscall has been available for some architectures - forever. For x86 it was introduced after 2.5.75, for x86-64, - ppc, and ppc64 it was introduced in 2.6.0-test3, for s390 it was - introduced in 2.6.21-rc5. */ -#define __ASSUME_UTIMES 1 - /* pselect/ppoll were introduced just after 2.6.16-rc1. On x86_64 and SH this appeared first in 2.6.19-rc1, on ia64 in 2.6.22-rc1. */ #define __ASSUME_PSELECT 1 diff --git a/sysdeps/unix/sysv/linux/tile/kernel-features.h b/sysdeps/unix/sysv/linux/tile/kernel-features.h index 78aacac8cc..3dc0dfc45e 100644 --- a/sysdeps/unix/sysv/linux/tile/kernel-features.h +++ b/sysdeps/unix/sysv/linux/tile/kernel-features.h @@ -28,9 +28,6 @@ #include_next <kernel-features.h> -/* asm-generic architectures do not have the utimes syscall. */ -#undef __ASSUME_UTIMES - /* Define this if your 32-bit syscall API requires 64-bit register pairs to start with an even-number register. */ #define __ASSUME_ALIGNED_REGISTER_PAIRS 1 diff --git a/sysdeps/unix/sysv/linux/utimes.c b/sysdeps/unix/sysv/linux/utimes.c index 2bcebeb698..5bea069cc5 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) |