about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-31 16:47:45 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-31 16:47:45 -0700
commit67b6df7841887f676f74843ae188301b34522dc5 (patch)
treef1af632e82c32b4c6bdb9a908a6d402374e6a3ab
parent1c2cfe819361507ca39a3a11cfdaefbc1a7cdd41 (diff)
downloadglibc-67b6df7841887f676f74843ae188301b34522dc5.tar.gz
glibc-67b6df7841887f676f74843ae188301b34522dc5.tar.xz
glibc-67b6df7841887f676f74843ae188301b34522dc5.zip
Update x86_64 bits/stat.h
-rw-r--r--ChangeLog10
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/bits/stat.h8
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c410414a4b..7625223566 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-05-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #14117]
+	* sysdeps/unix/sysv/linux/x86_64/bits/stat.h (_STAT_VER_KERNEL):
+	Defined to 1 if __x86_64__ isn't defined.
+	(_STAT_VER_LINUX_OLD): New.
+	(st_atime): Remove duplicate.
+	(st_mtime): Likewise.
+	(st_ctime): Likewise.
+
 2012-05-31  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/fpu/libm-test-ulps: Remove sqrt(2) and sqrt test
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/stat.h b/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
index 691c4370e5..e4c0b24ee4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
@@ -23,9 +23,9 @@
 #define _BITS_STAT_H	1
 
 /* Versions of the `struct stat' data structure.  */
-#define _STAT_VER_KERNEL	0
-
 #ifndef __x86_64__
+# define _STAT_VER_LINUX_OLD	1
+# define _STAT_VER_KERNEL	1
 # define _STAT_VER_SVR4		2
 # define _STAT_VER_LINUX	3
 
@@ -34,6 +34,7 @@
 # define _MKNOD_VER_SVR4	2
 # define _MKNOD_VER		_MKNOD_VER_LINUX /* The bits defined below.  */
 #else
+# define _STAT_VER_KERNEL	0
 # define _STAT_VER_LINUX	1
 
 /* x86-64 versions of the `xmknod' interface.  */
@@ -151,9 +152,6 @@ struct stat64
     struct timespec st_atim;		/* Time of last access.  */
     struct timespec st_mtim;		/* Time of last modification.  */
     struct timespec st_ctim;		/* Time of last status change.  */
-#  define st_atime st_atim.tv_sec	/* Backward compatibility.  */
-#  define st_mtime st_mtim.tv_sec
-#  define st_ctime st_ctim.tv_sec
 # else
     __time_t st_atime;			/* Time of last access.  */
     __syscall_ulong_t st_atimensec;	/* Nscecs of last access.  */