Signed-off-by: gfleury <gfleury@disroot.org>
---
htl/Makefile | 2 +-
htl/Versions | 4 +++-
sysdeps/htl/pt-condattr-setclock.c | 10 ++++++++--
sysdeps/mach/hurd/i386/libc.abilist | 2 ++
sysdeps/mach/hurd/i386/libpthread.abilist | 1 -
sysdeps/mach/hurd/x86_64/libc.abilist | 2 ++
sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 -
7 files changed, 16 insertions(+), 6 deletions(-)
@@ -92,7 +92,6 @@ libpthread-routines := \
pt-rwlock-timedrdlock \
pt-rwlock-timedwrlock \
pt-rwlock-unlock \
- pt-condattr-setclock \
pt-condattr-setpshared \
pt-cond-destroy \
pt-cond-init \
@@ -206,6 +205,7 @@ routines := \
pt-condattr-getclock \
pt-condattr-getpshared \
pt-condattr-init \
+ pt-condattr-setclock \
pt-getschedparam \
pt-nthreads \
pt-pthread_self \
@@ -30,6 +30,7 @@ libc {
pthread_condattr_init;
pthread_condattr_destroy;
pthread_condattr_getpshared;
+ pthread_condattr_setclock;
}
GLIBC_2.21 {
@@ -70,6 +71,7 @@ libc {
pthread_attr_setguardsize;
pthread_condattr_getclock;
pthread_condattr_getpshared;
+ pthread_condattr_setclock;
}
@@ -127,7 +129,7 @@ libpthread {
pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init;
pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait;
- pthread_condattr_setclock; pthread_condattr_setpshared;
+ pthread_condattr_setpshared;
pthread_create; pthread_detach; pthread_exit;
@@ -17,10 +17,11 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
+#include <shlib-compat.h>
#include <pt-internal.h>
int
-pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock)
+__pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock)
{
/* Only a few clocks are allowed. CLOCK_REALTIME is always allowed.
CLOCK_MONOTONIC only if the kernel has the necessary support. */
@@ -34,7 +35,7 @@ pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock)
struct timespec ts;
int res;
- res = clock_gettime (CLOCK_MONOTONIC, &ts);
+ res = __clock_gettime (CLOCK_MONOTONIC, &ts);
avail = res < 0 ? -1 : 1;
}
@@ -49,3 +50,8 @@ pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock)
return 0;
}
+versioned_symbol (libc, __pthread_condattr_setclock, pthread_condattr_setclock, GLIBC_2_41);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_condattr_setclock, pthread_condattr_setclock, GLIBC_2_12);
+#endif
@@ -53,6 +53,7 @@ GLIBC_2.12 pthread_condattr_destroy F
GLIBC_2.12 pthread_condattr_getclock F
GLIBC_2.12 pthread_condattr_getpshared F
GLIBC_2.12 pthread_condattr_init F
+GLIBC_2.12 pthread_condattr_setclock F
GLIBC_2.12 pthread_equal F
GLIBC_2.12 pthread_getschedparam F
GLIBC_2.12 pthread_self F
@@ -2509,6 +2510,7 @@ GLIBC_2.41 pthread_attr_setstackaddr F
GLIBC_2.41 pthread_attr_setstacksize F
GLIBC_2.41 pthread_condattr_getclock F
GLIBC_2.41 pthread_condattr_getpshared F
+GLIBC_2.41 pthread_condattr_setclock F
GLIBC_2.5 __readlinkat_chk F
GLIBC_2.5 inet6_opt_append F
GLIBC_2.5 inet6_opt_find F
@@ -36,7 +36,6 @@ GLIBC_2.12 pthread_cond_init F
GLIBC_2.12 pthread_cond_signal F
GLIBC_2.12 pthread_cond_timedwait F
GLIBC_2.12 pthread_cond_wait F
-GLIBC_2.12 pthread_condattr_setclock F
GLIBC_2.12 pthread_condattr_setpshared F
GLIBC_2.12 pthread_create F
GLIBC_2.12 pthread_detach F
@@ -1541,6 +1541,7 @@ GLIBC_2.38 pthread_condattr_destroy F
GLIBC_2.38 pthread_condattr_getclock F
GLIBC_2.38 pthread_condattr_getpshared F
GLIBC_2.38 pthread_condattr_init F
+GLIBC_2.38 pthread_condattr_setclock F
GLIBC_2.38 pthread_equal F
GLIBC_2.38 pthread_exit F
GLIBC_2.38 pthread_getschedparam F
@@ -2204,6 +2205,7 @@ GLIBC_2.41 pthread_attr_setstackaddr F
GLIBC_2.41 pthread_attr_setstacksize F
GLIBC_2.41 pthread_condattr_getclock F
GLIBC_2.41 pthread_condattr_getpshared F
+GLIBC_2.41 pthread_condattr_setclock F
HURD_CTHREADS_0.3 __cthread_getspecific F
HURD_CTHREADS_0.3 __cthread_keycreate F
HURD_CTHREADS_0.3 __cthread_setspecific F
@@ -55,7 +55,6 @@ GLIBC_2.38 pthread_cond_init F
GLIBC_2.38 pthread_cond_signal F
GLIBC_2.38 pthread_cond_timedwait F
GLIBC_2.38 pthread_cond_wait F
-GLIBC_2.38 pthread_condattr_setclock F
GLIBC_2.38 pthread_condattr_setpshared F
GLIBC_2.38 pthread_create F
GLIBC_2.38 pthread_detach F