diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | conform/data/sys/stat.h-data | 5 | ||||
| -rw-r--r-- | sysdeps/nacl/bits/stat.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/generic/bits/stat.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/bits/stat.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/microblaze/bits/stat.h | 4 |
7 files changed, 29 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index f06cb9487d..f0888fc794 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2015-05-26 Szabolcs Nagy <szabolcs.nagy@arm.com> + + [BZ #18234] + * conform/data/sys/stat.h-data (struct stat): Add tests for st_atim, + st_mtim and st_ctim members. + * sysdeps/nacl/bits/stat.h (struct stat, struct stat64): Make + st_atim, st_ctim, st_mtim visible under __USE_XOPEN2K8 only. + * sysdeps/unix/sysv/linux/generic/bits/stat.h (struct stat,): + (struct stat64): Likewise. + * sysdeps/unix/sysv/linux/ia64/bits/stat.h (struct stat,): + (struct stat64): Likewise. + * sysdeps/unix/sysv/linux/microblaze/bits/stat.h (struct stat,): + (struct stat64): Likewise. + 2015-05-26 Adhemerval Zanella <adhemerval.zanella@linaro.org> * sysdeps/unix/sysv/linux/aarch64/gettimeofday.c (HAVE_VSYSCALL): diff --git a/NEWS b/NEWS index 2e47f796c3..d50560a37d 100644 --- a/NEWS +++ b/NEWS @@ -18,8 +18,8 @@ Version 2.22 18029, 18030, 18032, 18036, 18038, 18039, 18042, 18043, 18046, 18047, 18049, 18068, 18080, 18093, 18100, 18104, 18110, 18111, 18125, 18128, 18138, 18185, 18196, 18197, 18206, 18210, 18211, 18217, 18220, 18221, - 18244, 18247, 18287, 18319, 18333, 18346, 18397, 18409, 18410, 18412, - 18418, 18434, 18444. + 18234, 18244, 18247, 18287, 18319, 18333, 18346, 18397, 18409, 18410, + 18412, 18418, 18434, 18444. * Cache information can be queried via sysconf() function on s390 e.g. with _SC_LEVEL1_ICACHE_SIZE as argument. diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data index 631daa41b0..f5b17a31ac 100644 --- a/conform/data/sys/stat.h-data +++ b/conform/data/sys/stat.h-data @@ -39,6 +39,11 @@ element {struct stat} off_t st_size element {struct stat} time_t st_atime element {struct stat} time_t st_mtime element {struct stat} time_t st_ctime +#if defined XOPEN2K8 || defined POSIX2008 +element {struct stat} {struct timespec} st_atim +element {struct stat} {struct timespec} st_mtim +element {struct stat} {struct timespec} st_ctim +#endif #if !defined POSIX && !defined POSIX2008 element {struct stat} blksize_t st_blksize element {struct stat} blkcnt_t st_blocks diff --git a/sysdeps/nacl/bits/stat.h b/sysdeps/nacl/bits/stat.h index 0cd3500adb..9b89b15fcd 100644 --- a/sysdeps/nacl/bits/stat.h +++ b/sysdeps/nacl/bits/stat.h @@ -42,7 +42,7 @@ struct stat __off_t st_size; /* Size of file, in bytes. */ __blksize_t st_blksize; /* Optimal block size for I/O. */ __blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */ -#if defined __USE_MISC || defined __USE_XOPEN2K8 +#if defined __USE_XOPEN2K8 /* Nanosecond resolution timestamps are stored in a format equivalent to 'struct timespec'. This is the type used whenever possible but the Unix namespace rules do not allow the @@ -81,7 +81,7 @@ struct stat64 __off_t st_size; /* Size of file, in bytes. */ __blksize_t st_blksize; /* Optimal block size for I/O. */ __blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */ -# if defined __USE_MISC || defined __USE_XOPEN2K8 +# if defined __USE_XOPEN2K8 /* Nanosecond resolution timestamps are stored in a format equivalent to 'struct timespec'. This is the type used whenever possible but the Unix namespace rules do not allow the diff --git a/sysdeps/unix/sysv/linux/generic/bits/stat.h b/sysdeps/unix/sysv/linux/generic/bits/stat.h index 42cb198ff8..4c32f66f16 100644 --- a/sysdeps/unix/sysv/linux/generic/bits/stat.h +++ b/sysdeps/unix/sysv/linux/generic/bits/stat.h @@ -66,7 +66,7 @@ struct stat __blksize_t st_blksize; /* Optimal block size for I/O. */ int __pad2; __field64(__blkcnt_t, __blkcnt64_t, st_blocks); /* 512-byte blocks */ -#ifdef __USE_MISC +#ifdef __USE_XOPEN2K8 /* Nanosecond resolution timestamps are stored in a format equivalent to 'struct timespec'. This is the type used whenever possible but the Unix namespace rules do not allow the @@ -107,7 +107,7 @@ struct stat64 __blksize_t st_blksize; /* Optimal block size for I/O. */ int __pad2; __blkcnt64_t st_blocks; /* Nr. 512-byte blocks allocated. */ -#ifdef __USE_MISC +#ifdef __USE_XOPEN2K8 /* Nanosecond resolution timestamps are stored in a format equivalent to 'struct timespec'. This is the type used whenever possible but the Unix namespace rules do not allow the diff --git a/sysdeps/unix/sysv/linux/ia64/bits/stat.h b/sysdeps/unix/sysv/linux/ia64/bits/stat.h index c14cd7b350..ed796767c4 100644 --- a/sysdeps/unix/sysv/linux/ia64/bits/stat.h +++ b/sysdeps/unix/sysv/linux/ia64/bits/stat.h @@ -41,7 +41,7 @@ struct stat int pad0; __dev_t st_rdev; /* Device number, if device. */ __off_t st_size; /* Size of file, in bytes. */ -#ifdef __USE_MISC +#ifdef __USE_XOPEN2K8 /* Nanosecond resolution timestamps are stored in a format equivalent to 'struct timespec'. This is the type used whenever possible but the Unix namespace rules do not allow the @@ -80,7 +80,7 @@ struct stat64 int pad0; __dev_t st_rdev; /* Device number, if device. */ __off_t st_size; /* Size of file, in bytes. */ -#ifdef __USE_MISC +#ifdef __USE_XOPEN2K8 /* Nanosecond resolution timestamps are stored in a format equivalent to 'struct timespec'. This is the type used whenever possible but the Unix namespace rules do not allow the diff --git a/sysdeps/unix/sysv/linux/microblaze/bits/stat.h b/sysdeps/unix/sysv/linux/microblaze/bits/stat.h index d45b275e93..df2d306312 100644 --- a/sysdeps/unix/sysv/linux/microblaze/bits/stat.h +++ b/sysdeps/unix/sysv/linux/microblaze/bits/stat.h @@ -50,7 +50,7 @@ struct stat __blksize_t st_blksize; /* Optimal block size for I/O. */ int __pad3; __blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */ -#ifdef __USE_MISC +#ifdef __USE_XOPEN2K8 /* Nanosecond resolution timestamps are stored in a format * equivalent to 'struct timespec'. This is the type used * whenever possible but the Unix namespace rules do not allow the @@ -135,7 +135,7 @@ struct stat64 __blksize_t st_blksize; /* Optimal block size for I/O. */ int __pad3; __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ -#ifdef __USE_MISC +#ifdef __USE_XOPEN2K8 /* Nanosecond resolution timestamps are stored in a format * equivalent to 'struct timespec'. This is the type used * whenever possible but the Unix namespace rules do not allow the |