aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--io/sys/stat.h6
-rw-r--r--linuxthreads/ChangeLog9
-rw-r--r--nptl/ChangeLog14
-rw-r--r--sysdeps/unix/sysv/linux/bits/stat.h39
-rw-r--r--sysdeps/unix/sysv/linux/kernel_stat.h18
-rw-r--r--sysdeps/unix/sysv/linux/xstatconv.c54
-rw-r--r--time/time.h6
7 files changed, 85 insertions, 61 deletions
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 32a3889da2..3136dd96b8 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991,1992,1995-1999,2000,2001,2002
- Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995-2001,2002 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
@@ -29,6 +28,9 @@
#include <bits/types.h> /* For __mode_t and __dev_t. */
#ifdef __USE_XOPEN
+# ifdef __USE_MISC
+# define __need_timespec
+# endif
# define __need_time_t
# include <time.h> /* For time_t. */
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 15a0974034..6927282eba 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-30 Jakub Jelinek <jakub@redhat.com>
+
+ * forward.c: Make all functions available by default again. It
+ caused too much trouble.
+ * internals.h (struct pthread_functions): Rename ptr_pthread_exit
+ and ptr_pthread_attr_init_2_* to ptr___pthread_exit and
+ ptr___pthread_attr_init_2_*.
+ * pthread.c (pthread_functions): Adjust.
+
2002-12-28 Jakub Jelinek <jakub@redhat.com>
* libc_pthread_init.c (__libc_pthread_init): Remove
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5b320962df..c8efcfb2c4 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,17 @@
+2002-12-28 Andreas Jaeger <aj@suse.de>
+
+ * sysdeps/unix/sysv/linux/xstatconv.c (xstat_conv): Adjust for
+ nsec resolution changes.
+ (xstat64_conv): Likewise.
+ (xstat32_conv): Likewise.
+ * sysdeps/unix/sysv/linux/kernel_stat.h: Add nsec resolution for
+ struct kernel_stat.
+ * sysdeps/unix/sysv/linux/bits/stat.h: Add nsec resolution for
+ structs stat and stat64.
+ * time/time.h (__timespec_defined): Define for __USE_MISC.
+ * io/sys/stat.h [__USE_MISC]: Define __need_timespec for struct
+ stat.
+
2002-12-30 Jakub Jelinek <jakub@redhat.com>
* forward.c (FORWARD2): Renamed from FORWARD3. Remove unused export
diff --git a/sysdeps/unix/sysv/linux/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h
index 42ecd04e06..790fdbbafd 100644
--- a/sysdeps/unix/sysv/linux/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/bits/stat.h
@@ -60,12 +60,27 @@ struct stat
#else
__blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
#endif
+#ifdef __USE_MISC
+ /* 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
+ identifier 'timespec' to appear in the <sys/stat.h> header.
+ Therefore we have to handle the use of this header in strictly
+ standard-compliant sources special. */
+ 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. */
- unsigned long int __unused1;
+ unsigned long int st_atimensec; /* Nscecs of last access. */
__time_t st_mtime; /* Time of last modification. */
- unsigned long int __unused2;
+ unsigned long int st_mtimensec; /* Nsecs of last modification. */
__time_t st_ctime; /* Time of last status change. */
- unsigned long int __unused3;
+ unsigned long int st_ctimensec; /* Nsecs of last status change. */
+#endif
#ifndef __USE_FILE_OFFSET64
unsigned long int __unused4;
unsigned long int __unused5;
@@ -91,12 +106,24 @@ struct stat64
__blksize_t st_blksize; /* Optimal block size for I/O. */
__blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
+#ifdef __USE_MISC
+ /* 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
+ identifier 'timespec' to appear in the <sys/stat.h> header.
+ Therefore we have to handle the use of this header in strictly
+ standard-compliant sources special. */
+ 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. */
+#else
__time_t st_atime; /* Time of last access. */
- unsigned long int __unused1;
+ unsigned long int st_atimensec; /* Nscecs of last access. */
__time_t st_mtime; /* Time of last modification. */
- unsigned long int __unused2;
+ unsigned long int st_mtimensec; /* Nsecs of last modification. */
__time_t st_ctime; /* Time of last status change. */
- unsigned long int __unused3;
+ unsigned long int st_ctimensec; /* Nsecs of last status change. */
+#endif
__ino64_t st_ino; /* File serial number. */
};
#endif
diff --git a/sysdeps/unix/sysv/linux/kernel_stat.h b/sysdeps/unix/sysv/linux/kernel_stat.h
index 7f4f91f43e..4146bb240f 100644
--- a/sysdeps/unix/sysv/linux/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/kernel_stat.h
@@ -15,31 +15,19 @@ struct kernel_stat
unsigned long int st_size;
unsigned long int st_blksize;
unsigned long int st_blocks;
- unsigned long int st_atime;
- unsigned long int __unused1;
-#define _HAVE___UNUSED1
- unsigned long int st_mtime;
- unsigned long int __unused2;
-#define _HAVE___UNUSED2
- unsigned long int st_ctime;
- unsigned long int __unused3;
-#define _HAVE___UNUSED3
+ struct timespec st_atim;
+ struct timespec st_mtim;
+ struct timespec st_ctim;
unsigned long int __unused4;
#define _HAVE___UNUSED4
unsigned long int __unused5;
#define _HAVE___UNUSED5
};
-#define _HAVE_STAT___UNUSED1
-#define _HAVE_STAT___UNUSED2
-#define _HAVE_STAT___UNUSED3
#define _HAVE_STAT___UNUSED4
#define _HAVE_STAT___UNUSED5
#define _HAVE_STAT___PAD1
#define _HAVE_STAT___PAD2
-#define _HAVE_STAT64___UNUSED1
-#define _HAVE_STAT64___UNUSED2
-#define _HAVE_STAT64___UNUSED3
#define _HAVE_STAT64___PAD1
#define _HAVE_STAT64___PAD2
#define _HAVE_STAT64___ST_INO
diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c
index d1f5e17b07..063489af33 100644
--- a/sysdeps/unix/sysv/linux/xstatconv.c
+++ b/sysdeps/unix/sysv/linux/xstatconv.c
@@ -60,18 +60,12 @@ xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
buf->st_size = kbuf->st_size;
buf->st_blksize = kbuf->st_blksize;
buf->st_blocks = kbuf->st_blocks;
- buf->st_atime = kbuf->st_atime;
-#ifdef _HAVE_STAT___UNUSED1
- buf->__unused1 = 0;
-#endif
- buf->st_mtime = kbuf->st_mtime;
-#ifdef _HAVE_STAT___UNUSED2
- buf->__unused2 = 0;
-#endif
- buf->st_ctime = kbuf->st_ctime;
-#ifdef _HAVE_STAT___UNUSED3
- buf->__unused3 = 0;
-#endif
+ buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
+ buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
+ buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
+ buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
+ buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
+ buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
#ifdef _HAVE_STAT___UNUSED4
buf->__unused4 = 0;
#endif
@@ -121,18 +115,12 @@ xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
buf->st_size = kbuf->st_size;
buf->st_blksize = kbuf->st_blksize;
buf->st_blocks = kbuf->st_blocks;
- buf->st_atime = kbuf->st_atime;
-#ifdef _HAVE_STAT64___UNUSED1
- buf->__unused1 = 0;
-#endif
- buf->st_mtime = kbuf->st_mtime;
-#ifdef _HAVE_STAT64___UNUSED2
- buf->__unused2 = 0;
-#endif
- buf->st_ctime = kbuf->st_ctime;
-#ifdef _HAVE_STAT64___UNUSED3
- buf->__unused3 = 0;
-#endif
+ buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
+ buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
+ buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
+ buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
+ buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
+ buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
#ifdef _HAVE_STAT64___UNUSED4
buf->__unused4 = 0;
#endif
@@ -216,18 +204,12 @@ xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
__set_errno (EOVERFLOW);
return -1;
}
- buf->st_atime = kbuf->st_atime;
-#ifdef _HAVE_STAT___UNUSED1
- buf->__unused1 = 0;
-#endif
- buf->st_mtime = kbuf->st_mtime;
-#ifdef _HAVE_STAT___UNUSED2
- buf->__unused2 = 0;
-#endif
- buf->st_ctime = kbuf->st_ctime;
-#ifdef _HAVE_STAT___UNUSED3
- buf->__unused3 = 0;
-#endif
+ buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
+ buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
+ buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
+ buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
+ buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
+ buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
#ifdef _HAVE_STAT___UNUSED4
buf->__unused4 = 0;
#endif
diff --git a/time/time.h b/time/time.h
index fa1c284fa5..febd0cb2a8 100644
--- a/time/time.h
+++ b/time/time.h
@@ -107,8 +107,10 @@ typedef __timer_t timer_t;
#undef __need_timer_t
-#if !defined __timespec_defined && \
- ((defined _TIME_H && defined __USE_POSIX199309) || defined __need_timespec)
+#if !defined __timespec_defined && \
+ ((defined _TIME_H && \
+ (defined __USE_POSIX199309 || defined __USE_MISC)) || \
+ defined __need_timespec)
# define __timespec_defined 1
/* POSIX.1b structure for a time value. This is like a `struct timeval' but
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 18:32:00 +0000