diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-09 16:35:28 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-09-28 16:21:59 -0300 |
| commit | 4af88f96dec03a7f732ac217e220afa4b48281d7 (patch) | |
| tree | d81ff41765e89537cbbc8d386b375e8dd487450e /sysdeps/unix/sysv/linux/hppa | |
| parent | 7c7671767e58ad49f15cf99f6861eaf91e05f60b (diff) | |
| download | glibc-4af88f96dec03a7f732ac217e220afa4b48281d7.tar glibc-4af88f96dec03a7f732ac217e220afa4b48281d7.tar.gz glibc-4af88f96dec03a7f732ac217e220afa4b48281d7.tar.bz2 glibc-4af88f96dec03a7f732ac217e220afa4b48281d7.zip | |
linux: Consolidate utimes
The generic version does not have time64 support and Linux default
uses utimensat. With hppa version gone, __ASSUME_UTIMES is not used
anymore.
Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
kernel).
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/hppa')
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/kernel-features.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/utimes.c | 30 |
2 files changed, 0 insertions, 35 deletions
diff --git a/sysdeps/unix/sysv/linux/hppa/kernel-features.h b/sysdeps/unix/sysv/linux/hppa/kernel-features.h index 8548b5c258..80eec02314 100644 --- a/sysdeps/unix/sysv/linux/hppa/kernel-features.h +++ b/sysdeps/unix/sysv/linux/hppa/kernel-features.h @@ -18,11 +18,6 @@ <https://www.gnu.org/licenses/>. */ -/* 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> #define __ASSUME_RECV_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/hppa/utimes.c b/sysdeps/unix/sysv/linux/hppa/utimes.c deleted file mode 100644 index a9c4a7ff45..0000000000 --- a/sysdeps/unix/sysv/linux/hppa/utimes.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Implement utimes for hppa. - Copyright (C) 2014-2020 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 - <https://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 |