From 67b6df7841887f676f74843ae188301b34522dc5 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 31 May 2012 16:47:45 -0700 Subject: [PATCH] Update x86_64 bits/stat.h --- ChangeLog | 10 ++++++++++ sysdeps/unix/sysv/linux/x86_64/bits/stat.h | 8 +++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c410414..7625223 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-05-31 H.J. Lu + + [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 * 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 691c437..e4c0b24 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. */ -- 2.7.4