htl: move pthread_getcpuclockid into libc.

Message-ID: <20250815181500.107433-7-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index e9fa141193721517411628869938244cd55d88b6..be7db0ab5d10c3c35efce9a3201caa44db243e64 100644 (file)
--- 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 c216db4b80935f57514cfdbd40b9e34b790827d6..68c7f01ed08ce27991d987a3a936e4b48e4b8b37 100644 (file)
--- 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 0402cef9a49c891109c6db128ca8812dfdfa84f4..b37b7b7809b2b38791b9fd50243874249a0c14d0 100644 (file)
--- 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 90faf894958863aaff5ee51ff0fb66bb9eb2cb62..791920f257ff63362f428c33d97b5c0faae63961 100644 (file)
--- 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 58e46f4e7a2ff9930731800de4b8221a045c3320..6c9ca8e1945c78635b5bf5b27e6b69a3ce6359cf 100644 (file)
--- 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 1d87ec1a8d68f72e3bb3f45cbeee90d0e125a4b3..0e03d9dc0501129b0c9178e396246c019aee2976 100644 (file)
--- 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 b40dda87c2ef00a140a3edd9055048d5673a570d..e68935dc5eb6b6235e6122dafc037b078406731a 100644 (file)
--- 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