@@ -218,7 +218,11 @@ libc_hidden_proto (__futimens64);
#else
extern int __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value);
extern int __timerfd_gettime64 (int fd, struct __itimerspec64 *value);
-librt_hidden_proto (__timer_gettime64);
+# if PTHREAD_IN_LIBC
+libc_hidden_proto (__timer_gettime64)
+# else
+librt_hidden_proto (__timer_gettime64)
+# endif
libc_hidden_proto (__timerfd_gettime64);
#endif
@@ -30,7 +30,6 @@ routines = \
librt-routines = \
librt-compat \
- timer_gettime \
timer_settime \
librt-shared-only-routines = librt-compat
@@ -63,6 +62,7 @@ $(librt-routines-var) += \
timer_create \
timer_delete \
timer_getoverr \
+ timer_gettime \
tests := tst-shm tst-timer tst-timer2 \
tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \
@@ -25,6 +25,7 @@ libc {
timer_create;
timer_delete;
timer_getoverrun;
+ timer_gettime;
%endif
shm_open;
shm_unlink;
@@ -87,6 +88,7 @@ libc {
timer_create;
timer_delete;
timer_getoverrun;
+ timer_gettime;
%endif
shm_open;
shm_unlink;
@@ -134,8 +136,8 @@ librt {
timer_create;
timer_delete;
timer_getoverrun;
-%endif
timer_gettime;
+%endif
timer_settime;
}
GLIBC_2.3.4 {
@@ -125,6 +125,7 @@ libc {
timer_create;
timer_delete;
timer_getoverrun;
+ timer_gettime;
}
GLIBC_2.3.4 {
sched_getaffinity; sched_setaffinity;
@@ -2009,6 +2009,7 @@ GLIBC_2.17 timelocal F
GLIBC_2.17 timer_create F
GLIBC_2.17 timer_delete F
GLIBC_2.17 timer_getoverrun F
+GLIBC_2.17 timer_gettime F
GLIBC_2.17 timerfd_create F
GLIBC_2.17 timerfd_gettime F
GLIBC_2.17 timerfd_settime F
@@ -2533,6 +2534,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,2 +1 @@
-GLIBC_2.17 timer_gettime F
GLIBC_2.17 timer_settime F
@@ -104,7 +104,6 @@ librt {
}
GLIBC_2.3.3 {
# Changed timer_t.
- timer_gettime;
timer_settime;
}
}
@@ -2096,6 +2096,7 @@ GLIBC_2.2 swscanf F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 ungetwc F
GLIBC_2.2 vfwprintf F
GLIBC_2.2 vfwscanf F
@@ -2359,6 +2360,7 @@ GLIBC_2.3.3 sys_siglist D 0x208
GLIBC_2.3.3 timer_create F
GLIBC_2.3.3 timer_delete F
GLIBC_2.3.3 timer_getoverrun F
+GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.4 _OtsAddX F
GLIBC_2.3.4 _OtsConvertFloatTX F
GLIBC_2.3.4 _OtsConvertFloatXT F
@@ -2630,6 +2632,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,8 +1,6 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3 __librt_version_placeholder F
-GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.3 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
@@ -1943,6 +1943,7 @@ GLIBC_2.32 timelocal F
GLIBC_2.32 timer_create F
GLIBC_2.32 timer_delete F
GLIBC_2.32 timer_getoverrun F
+GLIBC_2.32 timer_gettime F
GLIBC_2.32 timerfd_create F
GLIBC_2.32 timerfd_gettime F
GLIBC_2.32 timerfd_settime F
@@ -2292,6 +2293,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,2 +1 @@
-GLIBC_2.32 timer_gettime F
GLIBC_2.32 timer_settime F
@@ -356,6 +356,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -2275,6 +2276,7 @@ GLIBC_2.4 timelocal F
GLIBC_2.4 timer_create F
GLIBC_2.4 timer_delete F
GLIBC_2.4 timer_getoverrun F
+GLIBC_2.4 timer_gettime F
GLIBC_2.4 times F
GLIBC_2.4 timezone D 0x4
GLIBC_2.4 tmpfile F
@@ -1,3 +1,2 @@
-GLIBC_2.4 timer_gettime F
GLIBC_2.4 timer_settime F
GLIBC_2.7 __librt_version_placeholder F
@@ -353,6 +353,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -2272,6 +2273,7 @@ GLIBC_2.4 timelocal F
GLIBC_2.4 timer_create F
GLIBC_2.4 timer_delete F
GLIBC_2.4 timer_getoverrun F
+GLIBC_2.4 timer_gettime F
GLIBC_2.4 times F
GLIBC_2.4 timezone D 0x4
GLIBC_2.4 tmpfile F
@@ -1,3 +1,2 @@
-GLIBC_2.4 timer_gettime F
GLIBC_2.4 timer_settime F
GLIBC_2.7 __librt_version_placeholder F
@@ -2033,6 +2033,7 @@ GLIBC_2.29 timelocal F
GLIBC_2.29 timer_create F
GLIBC_2.29 timer_delete F
GLIBC_2.29 timer_getoverrun F
+GLIBC_2.29 timer_gettime F
GLIBC_2.29 timerfd_create F
GLIBC_2.29 timerfd_gettime F
GLIBC_2.29 timerfd_settime F
@@ -2476,6 +2477,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,2 +1 @@
-GLIBC_2.29 timer_gettime F
GLIBC_2.29 timer_settime F
@@ -1747,6 +1747,7 @@ GLIBC_2.2 timelocal F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 times F
GLIBC_2.2 timezone D 0x4
GLIBC_2.2 tmpfile F
@@ -2429,6 +2430,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,5 +1,4 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -2109,6 +2109,7 @@ GLIBC_2.2 swscanf F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 ungetwc F
GLIBC_2.2 versionsort64 F
GLIBC_2.2 vfwprintf F
@@ -2613,6 +2614,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,5 +1,4 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -30,7 +30,6 @@ libc {
librt {
GLIBC_2.3.3 {
# Changed timer_t.
- timer_gettime;
timer_settime;
}
}
@@ -1768,6 +1768,7 @@ GLIBC_2.2 timelocal F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 times F
GLIBC_2.2 timezone D 0x8
GLIBC_2.2 tmpfile F
@@ -2224,6 +2225,7 @@ GLIBC_2.3.3 sys_siglist D 0x208
GLIBC_2.3.3 timer_create F
GLIBC_2.3.3 timer_delete F
GLIBC_2.3.3 timer_getoverrun F
+GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.4 __chk_fail F
GLIBC_2.3.4 __fprintf_chk F
GLIBC_2.3.4 __gets_chk F
@@ -2468,6 +2470,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,7 +1,5 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
-GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.3 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
@@ -357,6 +357,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -2255,6 +2256,7 @@ GLIBC_2.4 timelocal F
GLIBC_2.4 timer_create F
GLIBC_2.4 timer_delete F
GLIBC_2.4 timer_getoverrun F
+GLIBC_2.4 timer_gettime F
GLIBC_2.4 times F
GLIBC_2.4 timezone D 0x4
GLIBC_2.4 tmpfile F
@@ -1,3 +1,2 @@
-GLIBC_2.4 timer_gettime F
GLIBC_2.4 timer_settime F
GLIBC_2.7 __librt_version_placeholder F
@@ -2065,6 +2065,7 @@ GLIBC_2.2 swscanf F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 ungetwc F
GLIBC_2.2 versionsort64 F
GLIBC_2.2 vfwprintf F
@@ -2556,6 +2557,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,5 +1,4 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -2013,6 +2013,7 @@ GLIBC_2.18 timelocal F
GLIBC_2.18 timer_create F
GLIBC_2.18 timer_delete F
GLIBC_2.18 timer_getoverrun F
+GLIBC_2.18 timer_gettime F
GLIBC_2.18 timerfd_create F
GLIBC_2.18 timerfd_gettime F
GLIBC_2.18 timerfd_settime F
@@ -2527,6 +2528,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,2 +1 @@
-GLIBC_2.18 timer_gettime F
GLIBC_2.18 timer_settime F
@@ -2013,6 +2013,7 @@ GLIBC_2.18 timelocal F
GLIBC_2.18 timer_create F
GLIBC_2.18 timer_delete F
GLIBC_2.18 timer_getoverrun F
+GLIBC_2.18 timer_gettime F
GLIBC_2.18 timerfd_create F
GLIBC_2.18 timerfd_gettime F
GLIBC_2.18 timerfd_settime F
@@ -2524,6 +2525,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,2 +1 @@
-GLIBC_2.18 timer_gettime F
GLIBC_2.18 timer_settime F
@@ -1996,6 +1996,7 @@ GLIBC_2.2 tdestroy F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 tmpfile F
GLIBC_2.2 tmpfile64 F
GLIBC_2.2 truncate64 F
@@ -2521,6 +2522,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,4 +1,3 @@
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -1994,6 +1994,7 @@ GLIBC_2.2 tdestroy F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 tmpfile F
GLIBC_2.2 tmpfile64 F
GLIBC_2.2 truncate64 F
@@ -2519,6 +2520,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,4 +1,3 @@
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -1992,6 +1992,7 @@ GLIBC_2.2 tdestroy F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 tmpfile F
GLIBC_2.2 tmpfile64 F
GLIBC_2.2 truncate64 F
@@ -2527,6 +2528,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1988,6 +1988,7 @@ GLIBC_2.2 tdestroy F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 tmpfile F
GLIBC_2.2 tmpfile64 F
GLIBC_2.2 truncate64 F
@@ -2521,6 +2522,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -2055,6 +2055,7 @@ GLIBC_2.21 timelocal F
GLIBC_2.21 timer_create F
GLIBC_2.21 timer_delete F
GLIBC_2.21 timer_getoverrun F
+GLIBC_2.21 timer_gettime F
GLIBC_2.21 timerfd_create F
GLIBC_2.21 timerfd_gettime F
GLIBC_2.21 timerfd_settime F
@@ -2566,6 +2567,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,2 +1 @@
-GLIBC_2.21 timer_gettime F
GLIBC_2.21 timer_settime F
@@ -2070,6 +2070,7 @@ GLIBC_2.2 swscanf F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 ungetwc F
GLIBC_2.2 vfwprintf F
GLIBC_2.2 vfwscanf F
@@ -2583,6 +2584,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,5 +1,4 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -2074,6 +2074,7 @@ GLIBC_2.2 swscanf F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 ungetwc F
GLIBC_2.2 vfwprintf F
GLIBC_2.2 vfwscanf F
@@ -2616,6 +2617,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -29,7 +29,6 @@ libc {
librt {
GLIBC_2.3.3 {
# Changed timer_t.
- timer_gettime;
timer_settime;
}
}
@@ -1889,6 +1889,7 @@ GLIBC_2.3 timelocal F
GLIBC_2.3 timer_create F
GLIBC_2.3 timer_delete F
GLIBC_2.3 timer_getoverrun F
+GLIBC_2.3 timer_gettime F
GLIBC_2.3 times F
GLIBC_2.3 timezone D 0x8
GLIBC_2.3 tmpfile F
@@ -2168,6 +2169,7 @@ GLIBC_2.3.3 sys_siglist D 0x208
GLIBC_2.3.3 timer_create F
GLIBC_2.3.3 timer_delete F
GLIBC_2.3.3 timer_getoverrun F
+GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.4 __chk_fail F
GLIBC_2.3.4 __fprintf_chk F
GLIBC_2.3.4 __gets_chk F
@@ -2432,6 +2434,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,6 +1,4 @@
-GLIBC_2.3 timer_gettime F
GLIBC_2.3 timer_settime F
-GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.3 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -2097,6 +2097,7 @@ GLIBC_2.17 timelocal F
GLIBC_2.17 timer_create F
GLIBC_2.17 timer_delete F
GLIBC_2.17 timer_getoverrun F
+GLIBC_2.17 timer_gettime F
GLIBC_2.17 timerfd_create F
GLIBC_2.17 timerfd_gettime F
GLIBC_2.17 timerfd_settime F
@@ -2729,6 +2730,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,2 +1 @@
-GLIBC_2.17 timer_gettime F
GLIBC_2.17 timer_settime F
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
@@ -1953,6 +1953,7 @@ GLIBC_2.33 timelocal F
GLIBC_2.33 timer_create F
GLIBC_2.33 timer_delete F
GLIBC_2.33 timer_getoverrun F
+GLIBC_2.33 timer_gettime F
GLIBC_2.33 timerfd_create F
GLIBC_2.33 timerfd_gettime F
GLIBC_2.33 timerfd_settime F
@@ -2294,6 +2295,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,2 +1 @@
-GLIBC_2.33 timer_gettime F
GLIBC_2.33 timer_settime F
@@ -2019,6 +2019,7 @@ GLIBC_2.27 timelocal F
GLIBC_2.27 timer_create F
GLIBC_2.27 timer_delete F
GLIBC_2.27 timer_getoverrun F
+GLIBC_2.27 timer_gettime F
GLIBC_2.27 timerfd_create F
GLIBC_2.27 timerfd_gettime F
GLIBC_2.27 timerfd_settime F
@@ -2494,6 +2495,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,2 +1 @@
-GLIBC_2.27 timer_gettime F
GLIBC_2.27 timer_settime F
@@ -2068,6 +2068,7 @@ GLIBC_2.2 swscanf F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 ungetwc F
GLIBC_2.2 versionsort64 F
GLIBC_2.2 vfwprintf F
@@ -2581,6 +2582,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,5 +1,4 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -9,7 +9,6 @@ libc {
librt {
GLIBC_2.3.3 {
# Changed timer_t.
- timer_gettime;
timer_settime;
}
}
@@ -1764,6 +1764,7 @@ GLIBC_2.2 timelocal F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 times F
GLIBC_2.2 timezone D 0x8
GLIBC_2.2 tmpfile F
@@ -2214,6 +2215,7 @@ GLIBC_2.3.3 sys_siglist D 0x208
GLIBC_2.3.3 timer_create F
GLIBC_2.3.3 timer_delete F
GLIBC_2.3.3 timer_getoverrun F
+GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.4 __chk_fail F
GLIBC_2.3.4 __fprintf_chk F
GLIBC_2.3.4 __gets_chk F
@@ -2469,6 +2471,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,6 +1,4 @@
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
-GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.3 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
@@ -1751,6 +1751,7 @@ GLIBC_2.2 timelocal F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 times F
GLIBC_2.2 timezone D 0x4
GLIBC_2.2 tmpfile F
@@ -2436,6 +2437,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,5 +1,4 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -1751,6 +1751,7 @@ GLIBC_2.2 timelocal F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 times F
GLIBC_2.2 timezone D 0x4
GLIBC_2.2 tmpfile F
@@ -2433,6 +2434,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,5 +1,4 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -2063,6 +2063,7 @@ GLIBC_2.2 swscanf F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 ungetwc F
GLIBC_2.2 vfwprintf F
GLIBC_2.2 vfwscanf F
@@ -2576,6 +2577,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,5 +1,4 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3 __librt_version_placeholder F
GLIBC_2.3.4 __librt_version_placeholder F
@@ -14,7 +14,6 @@ libc {
librt {
GLIBC_2.3.3 {
# Changed timer_t.
- timer_gettime;
timer_settime;
}
}
@@ -1794,6 +1794,7 @@ GLIBC_2.2 timelocal F
GLIBC_2.2 timer_create F
GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
+GLIBC_2.2 timer_gettime F
GLIBC_2.2 times F
GLIBC_2.2 timezone D 0x8
GLIBC_2.2 tmpfile F
@@ -2248,6 +2249,7 @@ GLIBC_2.3.3 sys_siglist D 0x208
GLIBC_2.3.3 timer_create F
GLIBC_2.3.3 timer_delete F
GLIBC_2.3.3 timer_getoverrun F
+GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.4 __chk_fail F
GLIBC_2.3.4 __fprintf_chk F
GLIBC_2.3.4 __gets_chk F
@@ -2491,6 +2493,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,8 +1,6 @@
GLIBC_2.1 __librt_version_placeholder F
-GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3 __librt_version_placeholder F
-GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.3 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
@@ -22,17 +22,19 @@
#include <sysdep.h>
#include <kernel-features.h>
#include <kernel-posix-timers.h>
+#include <shlib-compat.h>
+#if !TIMER_T_WAS_INT_COMPAT
int
__timer_gettime64 (timer_t timerid, struct __itimerspec64 *value)
{
kernel_timer_t ktimerid = timerid_to_kernel_timer (timerid);
-#ifndef __NR_timer_gettime64
-# define __NR_timer_gettime64 __NR_timer_gettime
-#endif
+# ifndef __NR_timer_gettime64
+# define __NR_timer_gettime64 __NR_timer_gettime
+# endif
int ret = INLINE_SYSCALL_CALL (timer_gettime64, ktimerid, value);
-#ifndef __ASSUME_TIME64_SYSCALLS
+# ifndef __ASSUME_TIME64_SYSCALLS
if (ret == 0 || errno != ENOSYS)
return ret;
@@ -43,12 +45,18 @@ __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value)
value->it_interval = valid_timespec_to_timespec64 (its32.it_interval);
value->it_value = valid_timespec_to_timespec64 (its32.it_value);
}
-#endif
+# endif
return ret;
}
-#if __TIMESIZE != 64
-librt_hidden_def (__timer_gettime64)
+# if __TIMESIZE == 64
+versioned_symbol (libc, __timer_gettime64, timer_gettime, GLIBC_2_34);
+# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (librt, __timer_gettime64, timer_gettime, GLIBC_2_2);
+# endif
+
+# else /* __TIMESIZE != 64 */
+libc_hidden_def (__timer_gettime64)
int
__timer_gettime (timer_t timerid, struct itimerspec *value)
@@ -63,5 +71,39 @@ __timer_gettime (timer_t timerid, struct itimerspec *value)
return retval;
}
-#endif
-weak_alias (__timer_gettime, timer_gettime)
+versioned_symbol (libc, __timer_gettime, timer_gettime, GLIBC_2_34);
+
+# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (librt, __timer_gettime, timer_gettime, GLIBC_2_2);
+# endif
+# endif /* __TIMESIZE != 64 */
+
+#else /* TIMER_T_WAS_INT_COMPAT */
+
+extern __typeof (timer_gettime) __timer_gettime_new;
+libc_hidden_proto (__timer_gettime_new)
+
+int
+___timer_gettime_new (timer_t timerid, struct itimerspec *value)
+{
+ kernel_timer_t ktimerid = timerid_to_kernel_timer (timerid);
+
+ return INLINE_SYSCALL_CALL (timer_gettime, ktimerid, value);
+}
+versioned_symbol (libc, ___timer_gettime_new, timer_gettime, GLIBC_2_34);
+libc_hidden_ver (___timer_gettime_new, __timer_gettime_new)
+
+# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_3_3, GLIBC_2_34)
+compat_symbol (librt, ___timer_gettime_new, timer_gettime, GLIBC_2_3_3);
+# endif
+
+# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3)
+int
+__timer_gettime_old (int timerid, struct itimerspec *value)
+{
+ return __timer_gettime_new (__timer_compat_list[timerid], value);
+}
+compat_symbol (librt, __timer_gettime_old, timer_gettime, GLIBC_2_2);
+# endif
+
+#endif /* TIMER_T_WAS_INT_COMPAT */
@@ -1763,6 +1763,7 @@ GLIBC_2.2.5 timelocal F
GLIBC_2.2.5 timer_create F
GLIBC_2.2.5 timer_delete F
GLIBC_2.2.5 timer_getoverrun F
+GLIBC_2.2.5 timer_gettime F
GLIBC_2.2.5 times F
GLIBC_2.2.5 timezone D 0x8
GLIBC_2.2.5 tmpfile F
@@ -2202,6 +2203,7 @@ GLIBC_2.3.3 sys_siglist D 0x208
GLIBC_2.3.3 timer_create F
GLIBC_2.3.3 timer_delete F
GLIBC_2.3.3 timer_getoverrun F
+GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.4 __chk_fail F
GLIBC_2.3.4 __fprintf_chk F
GLIBC_2.3.4 __gets_chk F
@@ -2447,6 +2449,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,6 +1,4 @@
-GLIBC_2.2.5 timer_gettime F
GLIBC_2.2.5 timer_settime F
-GLIBC_2.3.3 timer_gettime F
GLIBC_2.3.3 timer_settime F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
@@ -11,7 +11,6 @@ libc {
librt {
GLIBC_2.3.3 {
# Changed timer_t.
- timer_gettime;
timer_settime;
}
}
deleted file mode 100644
@@ -1,41 +0,0 @@
-/* Copyright (C) 2003-2021 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; see the file COPYING.LIB. If
- not, see <https://www.gnu.org/licenses/>. */
-
-#include <shlib-compat.h>
-#include <sysdep.h>
-#include <kernel-posix-timers.h>
-#include "compat-timer.h"
-
-int
-__timer_gettime_new (timer_t timerid, struct itimerspec *value)
-{
- kernel_timer_t ktimerid = timerid_to_kernel_timer (timerid);
-
- return INLINE_SYSCALL_CALL (timer_gettime, ktimerid, value);
-}
-versioned_symbol (librt, __timer_gettime_new, timer_gettime, GLIBC_2_3_3);
-
-
-#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3)
-int
-__timer_gettime_old (int timerid, struct itimerspec *value)
-{
- return __timer_gettime_new (__timer_compat_list[timerid], value);
-}
-compat_symbol (librt, __timer_gettime_old, timer_gettime, GLIBC_2_2);
-#endif
@@ -2014,6 +2014,7 @@ GLIBC_2.16 timelocal F
GLIBC_2.16 timer_create F
GLIBC_2.16 timer_delete F
GLIBC_2.16 timer_getoverrun F
+GLIBC_2.16 timer_gettime F
GLIBC_2.16 timerfd_create F
GLIBC_2.16 timerfd_gettime F
GLIBC_2.16 timerfd_settime F
@@ -2548,6 +2549,7 @@ GLIBC_2.34 thrd_join F
GLIBC_2.34 timer_create F
GLIBC_2.34 timer_delete F
GLIBC_2.34 timer_getoverrun F
+GLIBC_2.34 timer_gettime F
GLIBC_2.34 timespec_getres F
GLIBC_2.34 tss_create F
GLIBC_2.34 tss_delete F
@@ -1,2 +1 @@
-GLIBC_2.16 timer_gettime F
GLIBC_2.16 timer_settime F