@@ -132,6 +132,14 @@ extern struct tm *__gmtime64_r (const __time64_t *__restrict __timer,
libc_hidden_proto (__gmtime64_r);
#endif
+#if __TIMESIZE == 64
+# define __clock_settime64 __clock_settime
+#else
+extern int __clock_settime64 (clockid_t clock_id,
+ const struct __timespec64 *tp);
+libc_hidden_proto (__clock_settime64)
+#endif
+
/* Compute the `struct tm' representation of T,
offset OFFSET seconds east of UTC,
and store year, yday, mon, mday, wday, hour, min, sec into *TP.
@@ -19,11 +19,9 @@
#include <sysdep.h>
#include <time.h>
-#include "kernel-posix-cpu-timers.h"
-
/* Set CLOCK to value TP. */
int
-__clock_settime (clockid_t clock_id, const struct timespec *tp)
+__clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp)
{
/* Make sure the time cvalue is OK. */
if (tp->tv_nsec < 0 || tp->tv_nsec >= 1000000000)
@@ -32,6 +30,52 @@ __clock_settime (clockid_t clock_id, const struct timespec *tp)
return -1;
}
+#if defined (__TIMESIZE) && __TIMESIZE != 64
+# ifdef __NR_clock_settime64
+ /* For 32 bit systems with no Y2038 support the *tp may have tv_pad
+ with some random values as *tp from __clock_settime is converted
+ to automatically allocated struct __timespec64 (ts64).
+
+ For 32 bit systems being Y2038 safe the tv_pad may be not zero,
+ as glibc exported struct timespec has 64 bit tv_sec, 32 bit
+ tv_nsec (to be still POSIX compliant -> long tv_nsec ) and 32
+ bits of unnamed padding.
+ If user program allocates the struct timespec automatically, the
+ padding may have random value and as being directly passed to
+ *tp needs to be cleared. */
+ timespec64_clear_padding (tp);
+ int ret = INLINE_SYSCALL_CALL (clock_settime64, clock_id, tp);
+# ifdef __ASSUME_64BIT_TIME
+ return ret;
+# else
+ if (ret == 0 || errno != ENOSYS)
+ /* Preserve non-error/non-ENOSYS return values. */
+ return ret;
+# endif
+# endif
+ /* Fall back to syscall supporting 32bit struct timespec. */
+ struct timespec ts32;
+ valid_timespec64_to_timespec (tp, &ts32);
+ return INLINE_SYSCALL_CALL (clock_settime, clock_id, &ts32);
+#else
return INLINE_SYSCALL_CALL (clock_settime, clock_id, tp);
+#endif
}
weak_alias (__clock_settime, clock_settime)
+
+#if __TIMESIZE != 64
+int
+__clock_settime (clockid_t clock_id, const struct timespec *tp)
+{
+ struct __timespec64 ts64;
+
+ if (! in_time_t_range (tp->tv_sec))
+ {
+ __set_errno (EOVERFLOW);
+ return -1;
+ }
+
+ valid_timespec_to_timespec64 (tp, &ts64);
+ return __clock_settime64 (clock_id, &ts64);
+}
+#endif