diff options
| -rw-r--r-- | include/time.h | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/time.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/time.c | 38 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86/time.c | 4 |
4 files changed, 50 insertions, 3 deletions
diff --git a/include/time.h b/include/time.h index edf6cdf829..caf2af5e74 100644 --- a/include/time.h +++ b/include/time.h @@ -317,6 +317,13 @@ extern int __timespec_get64 (struct __timespec64 *ts, int base); libc_hidden_proto (__timespec_get64) #endif +#if __TIMESIZE == 64 +# define __time64 __time +#else +extern __time64_t __time64 (__time64_t *timer); +libc_hidden_proto (__time64) +#endif + /* Use in the clock_* functions. Size of the field representing the actual clock ID. */ #define CLOCK_IDFIELD_SIZE 3 diff --git a/sysdeps/unix/sysv/linux/powerpc/time.c b/sysdeps/unix/sysv/linux/powerpc/time.c index d10f449c5c..4fd5e138a3 100644 --- a/sysdeps/unix/sysv/linux/powerpc/time.c +++ b/sysdeps/unix/sysv/linux/powerpc/time.c @@ -16,5 +16,7 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#define USE_IFUNC_TIME +#ifdef __powerpc64__ +# define USE_IFUNC_TIME +#endif #include <sysdeps/unix/sysv/linux/time.c> diff --git a/sysdeps/unix/sysv/linux/time.c b/sysdeps/unix/sysv/linux/time.c index 9d8e573c0a..df5d4ca0fb 100644 --- a/sysdeps/unix/sysv/linux/time.c +++ b/sysdeps/unix/sysv/linux/time.c @@ -47,5 +47,41 @@ time (time_t *t) } # endif /* !SHARED */ #else /* USE_IFUNC_TIME */ -# include <time/time.c> +# include <time.h> +# include <time-clockid.h> +# include <errno.h> + +/* Return the time now, and store it in *TIMER if not NULL. */ + +__time64_t +__time64 (__time64_t *timer) +{ + struct __timespec64 ts; + __clock_gettime64 (TIME_CLOCK_GETTIME_CLOCKID, &ts); + + if (timer != NULL) + *timer = ts.tv_sec; + return ts.tv_sec; +} + +# if __TIMESIZE != 64 +libc_hidden_def (__time64) + +time_t +__time (time_t *timer) +{ + __time64_t t = __time64 (NULL); + + if (! in_time_t_range (t)) + { + __set_errno (EOVERFLOW); + return -1; + } + + if (timer != NULL) + *timer = t; + return t; +} +# endif +weak_alias (__time, time) #endif diff --git a/sysdeps/unix/sysv/linux/x86/time.c b/sysdeps/unix/sysv/linux/x86/time.c index 1d158e443c..ed2c5f5dbb 100644 --- a/sysdeps/unix/sysv/linux/x86/time.c +++ b/sysdeps/unix/sysv/linux/x86/time.c @@ -16,5 +16,7 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#define USE_IFUNC_TIME +#ifdef __x86_64__ +# define USE_IFUNC_TIME +#endif #include <sysdeps/unix/sysv/linux/time.c> |