about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-03-06 14:13:18 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-03-06 14:13:18 +0000
commit67737b8f07c3664c716f69fd1a531f51a002d1f8 (patch)
treee151aa5d93f7bd0021c3282d0ca355b04cfe1ff9
parentaa97dee16e5299bf2b8f7b2d67215361c7c904e2 (diff)
downloadglibc-67737b8f07c3664c716f69fd1a531f51a002d1f8.tar.gz
glibc-67737b8f07c3664c716f69fd1a531f51a002d1f8.tar.xz
glibc-67737b8f07c3664c716f69fd1a531f51a002d1f8.zip
Don't define __ASSUME_UTIMES for linux-generic architectures.
The __ASSUME_UTIMES macro describes whether the utimes syscall is
present.  For linux-generic architectures, it isn't (utimensat is
instead), so the macro should not be defined for them; this patch
removes the spurious definitions for such architectures.  (Those
definitions don't actually cause any user-visible bug, because
futimes.c doesn't use __ASSUME_UTIMES if __ASSUME_UTIMENSAT is
defined, and futimesat.c and utimes.c are overridden for
linux-generic, but the definitions are still logically incorrect.)

	* sysdeps/unix/sysv/linux/aarch64/kernel-features.h
	(__ASSUME_UTIMES): Remove.
	* sysdeps/unix/sysv/linux/tile/kernel-features.h
	(__ASSUME_UTIMES): Likewise.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/kernel-features.h1
-rw-r--r--sysdeps/unix/sysv/linux/tile/kernel-features.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f08052ad9c..765f0b703a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-03-06  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+	(__ASSUME_UTIMES): Remove.
+	* sysdeps/unix/sysv/linux/tile/kernel-features.h
+	(__ASSUME_UTIMES): Likewise.
+
 	* math/gen-auto-libm-tests.c: Update comment on output format.
 	(output_for_one_input_case): Generate before-rounding and
 	after-rounding information as conditions on output flags not
diff --git a/sysdeps/unix/sysv/linux/aarch64/kernel-features.h b/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
index 417f89b2d9..53039f9316 100644
--- a/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
@@ -34,6 +34,5 @@
 #define __ASSUME_SENDMMSG_SYSCALL       1
 #define __ASSUME_SIGNALFD4		1
 #define __ASSUME_SOCK_CLOEXEC           1
-#define __ASSUME_UTIMES                 1
 
 #include_next <kernel-features.h>
diff --git a/sysdeps/unix/sysv/linux/tile/kernel-features.h b/sysdeps/unix/sysv/linux/tile/kernel-features.h
index bf7bddc47f..b028152d43 100644
--- a/sysdeps/unix/sysv/linux/tile/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/tile/kernel-features.h
@@ -18,7 +18,6 @@
 
 
 /* TILE glibc support starts with 2.6.36, guaranteeing many kernel features. */
-#define __ASSUME_UTIMES			1
 #define __ASSUME_O_CLOEXEC		1
 #define __ASSUME_SOCK_CLOEXEC		1
 #define __ASSUME_IN_NONBLOCK		1