X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftime%2Fclock_gettime.c;h=799251d8a7c7cab612dc620fb0ceabd10797b4c2;hb=6e89210669dfc93302a181a80ed440132e41f0dd;hp=9fef54a497b980e1ea121b584e1ed0c6fe83e044;hpb=e91c375fd027a485bd7415afbaf059d429e11e11;p=oweals%2Fmusl.git

diff --git a/src/time/clock_gettime.c b/src/time/clock_gettime.c
index 9fef54a4..799251d8 100644
--- a/src/time/clock_gettime.c
+++ b/src/time/clock_gettime.c
@@ -3,20 +3,15 @@
 #include <stdint.h>
 #include "syscall.h"
 #include "libc.h"
+#include "atomic.h"
 
-int __vdso_clock_gettime(clockid_t, struct timespec *) __attribute__((weak));
-static int (*cgt)(clockid_t, struct timespec *) = __vdso_clock_gettime;
-
-int __clock_gettime(clockid_t clk, struct timespec *ts)
+static int sc_clock_gettime(clockid_t clk, struct timespec *ts)
 {
-	int r;
-	if (cgt) return cgt(clk, ts);
-	r = __syscall(SYS_clock_gettime, clk, ts);
+	int r = __syscall(SYS_clock_gettime, clk, ts);
 	if (!r) return r;
 	if (r == -ENOSYS) {
-		cgt = 0;
 		if (clk == CLOCK_REALTIME) {
-			__syscall(SYS_gettimeofday, clk, ts, 0);
+			__syscall(SYS_gettimeofday, ts, 0);
 			ts->tv_nsec = (int)ts->tv_nsec * 1000;
 			return 0;
 		}
@@ -26,4 +21,21 @@ int __clock_gettime(clockid_t clk, struct timespec *ts)
 	return -1;
 }
 
+void *__vdsosym(const char *, const char *);
+
+int __clock_gettime(clockid_t clk, struct timespec *ts)
+{
+#ifdef VDSO_CGT_SYM
+	static int (*cgt)(clockid_t, struct timespec *);
+	if (!cgt) {
+		void *f = __vdsosym(VDSO_CGT_VER, VDSO_CGT_SYM);
+		if (!f) f = (void *)sc_clock_gettime;
+		a_cas_p(&cgt, 0, f);
+	}
+	return cgt(clk, ts);
+#else
+	return sc_clock_gettime(clk, ts);
+#endif
+}
+
 weak_alias(__clock_gettime, clock_gettime);