From: gfleury <[email protected]>
Message-ID: <[email protected]>
---
htl/Makefile | 2 +-
htl/Versions | 4 ++--
sysdeps/htl/pt-getcpuclockid.c | 8 +++++++-
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, 14 insertions(+), 6 deletions(-)
diff --git a/htl/Makefile b/htl/Makefile
index e9fa141193..be7db0ab5d 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -45,7 +45,6 @@ libpthread-routines := \
pt-spin \
pt-sigstate-init \
pt-kill \
- pt-getcpuclockid \
pt-yield \
pt-getname-np \
pt-setname-np \
@@ -150,6 +149,7 @@ routines := \
pt-dealloc \
pt-destroy-specific \
pt-getconcurrency \
+ pt-getcpuclockid \
pt-getschedparam \
pt-getspecific \
pt-init-specific \
diff --git a/htl/Versions b/htl/Versions
index c216db4b80..68c7f01ed0 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -15,6 +15,7 @@ libc {
pthread_equal;
pthread_getschedparam;
pthread_getspecific;
+ pthread_getcpuclockid;
pthread_setschedparam;
pthread_attr_destroy;
pthread_attr_getguardsize;
@@ -191,6 +192,7 @@ libc {
GLIBC_2.43 {
pthread_getconcurrency;
+ pthread_getcpuclockid;
pthread_setconcurrency;
pthread_setschedprio;
}
@@ -284,8 +286,6 @@ libpthread {
pthread_getattr_np;
- pthread_getcpuclockid;
-
pthread_join;
pthread_kill;
diff --git a/sysdeps/htl/pt-getcpuclockid.c b/sysdeps/htl/pt-getcpuclockid.c
index 0402cef9a4..b37b7b7809 100644
--- a/sysdeps/htl/pt-getcpuclockid.c
+++ b/sysdeps/htl/pt-getcpuclockid.c
@@ -20,9 +20,10 @@
#include <time.h>
#include <pt-internal.h>
+#include <shlib-compat.h>
int
-pthread_getcpuclockid (pthread_t thread, clockid_t *clock)
+__pthread_getcpuclockid (pthread_t thread, clockid_t *clock)
{
#ifdef CLOCK_THREAD_CPUTIME_ID
*clock = CLOCK_THREAD_CPUTIME_ID;
@@ -33,3 +34,8 @@ pthread_getcpuclockid (pthread_t thread, clockid_t *clock)
}
stub_warning (pthread_getcpuclockid)
+versioned_symbol (libc, __pthread_getcpuclockid, pthread_getcpuclockid,
GLIBC_2_43);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43)
+compat_symbol (libpthread, __pthread_getcpuclockid, pthread_getcpuclockid,
GLIBC_2_12);
+#endif
diff --git a/sysdeps/mach/hurd/i386/libc.abilist
b/sysdeps/mach/hurd/i386/libc.abilist
index 90faf89495..791920f257 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -72,6 +72,7 @@ GLIBC_2.12 pthread_condattr_setclock F
GLIBC_2.12 pthread_condattr_setpshared F
GLIBC_2.12 pthread_equal F
GLIBC_2.12 pthread_getconcurrency F
+GLIBC_2.12 pthread_getcpuclockid F
GLIBC_2.12 pthread_getschedparam F
GLIBC_2.12 pthread_getspecific F
GLIBC_2.12 pthread_key_create F
@@ -2637,6 +2638,7 @@ GLIBC_2.42 uimaxabs F
GLIBC_2.42 ulabs F
GLIBC_2.42 ullabs F
GLIBC_2.43 pthread_getconcurrency F
+GLIBC_2.43 pthread_getcpuclockid F
GLIBC_2.43 pthread_setconcurrency F
GLIBC_2.43 pthread_setschedprio F
GLIBC_2.5 __readlinkat_chk F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist
b/sysdeps/mach/hurd/i386/libpthread.abilist
index 58e46f4e7a..6c9ca8e194 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -25,7 +25,6 @@ GLIBC_2.12 pthread_create F
GLIBC_2.12 pthread_detach F
GLIBC_2.12 pthread_exit F
GLIBC_2.12 pthread_getattr_np F
-GLIBC_2.12 pthread_getcpuclockid F
GLIBC_2.12 pthread_join F
GLIBC_2.12 pthread_kill F
GLIBC_2.12 pthread_mutex_transfer_np F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist
b/sysdeps/mach/hurd/x86_64/libc.abilist
index 1d87ec1a8d..0e03d9dc05 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1555,6 +1555,7 @@ GLIBC_2.38 pthread_condattr_setpshared F
GLIBC_2.38 pthread_equal F
GLIBC_2.38 pthread_exit F
GLIBC_2.38 pthread_getconcurrency F
+GLIBC_2.38 pthread_getcpuclockid F
GLIBC_2.38 pthread_getschedparam F
GLIBC_2.38 pthread_getspecific F
GLIBC_2.38 pthread_key_create F
@@ -2319,6 +2320,7 @@ GLIBC_2.42 uimaxabs F
GLIBC_2.42 ulabs F
GLIBC_2.42 ullabs F
GLIBC_2.43 pthread_getconcurrency F
+GLIBC_2.43 pthread_getcpuclockid F
GLIBC_2.43 pthread_setconcurrency F
GLIBC_2.43 pthread_setschedprio F
HURD_CTHREADS_0.3 __cthread_getspecific F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist
b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index b40dda87c2..e68935dc5e 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -43,7 +43,6 @@ GLIBC_2.38 pthread_create F
GLIBC_2.38 pthread_detach F
GLIBC_2.38 pthread_exit F
GLIBC_2.38 pthread_getattr_np F
-GLIBC_2.38 pthread_getcpuclockid F
GLIBC_2.38 pthread_hurd_cond_timedwait_np F
GLIBC_2.38 pthread_hurd_cond_wait_np F
GLIBC_2.38 pthread_join F
--
2.47.2
