aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/hppa
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/hppa
parent4c0c0e2aeffe050b78ab515ae54a051dc7a1e2da (diff)
downloadglibc-90aa3d09450903859e2845399729775b19bde50c.tar
glibc-90aa3d09450903859e2845399729775b19bde50c.tar.gz
glibc-90aa3d09450903859e2845399729775b19bde50c.tar.bz2
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')
-rw-r--r--sysdeps/unix/sysv/linux/hppa/kernel-features.h10
-rw-r--r--sysdeps/unix/sysv/linux/hppa/utimes.c30
2 files changed, 35 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>
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