rework langinfo code for ABI compat and for use by time code

[musl] / src / time / clock_gettime.c

diff --git a/src/time/clock_gettime.c b/src/time/clock_gettime.c
index c27c9e9..ad5c09d 100644 (file)
--- a/src/time/clock_gettime.c
+++ b/src/time/clock_gettime.c
@@ -4,14 +4,9 @@
 #include "syscall.h"
 #include "libc.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) {
                if (clk == CLOCK_REALTIME) {
@@ -25,4 +20,14 @@ int __clock_gettime(clockid_t clk, struct timespec *ts)
        return -1;
 }
 
+weak_alias(sc_clock_gettime, __vdso_clock_gettime);
+
+int (*__cgt)(clockid_t, struct timespec *) = __vdso_clock_gettime;
+
+int __clock_gettime(clockid_t clk, struct timespec *ts)
+{
+       /* Conditional is to make this work prior to dynamic linking */
+       return __cgt ? __cgt(clk, ts) : sc_clock_gettime(clk, ts);
+}
+
 weak_alias(__clock_gettime, clock_gettime);