[hurd,commited] htl: move pthread_condattr_getclock into libc.

[Samuel Thibault]

From: gfleury <gfleury@disroot.org>

Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241126205329.2215295-4-gfleury@disroot.org>
---
 htl/Makefile                                | 2 +-
 htl/Versions                                | 3 ++-
 sysdeps/htl/pt-condattr-getclock.c          | 9 +++++++--
 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 5f9b2ba24d..ef01902c3c 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -93,7 +93,6 @@ libpthread-routines := \
   pt-rwlock-timedwrlock \
   pt-rwlock-unlock \
   pt-condattr-init \
-  pt-condattr-getclock \
   pt-condattr-getpshared \
   pt-condattr-setclock \
   pt-condattr-setpshared \
@@ -206,6 +205,7 @@ routines := \
   pt-attr-setstacksize \
   pt-cond \
   pt-condattr-destroy \
+  pt-condattr-getclock \
   pt-getschedparam \
   pt-nthreads \
   pt-pthread_self \
diff --git a/htl/Versions b/htl/Versions
index 7aa8a1fef7..887703ef98 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -26,6 +26,7 @@ libc {
     pthread_attr_setscope;
     pthread_attr_setschedparam;
     pthread_attr_init;
+    pthread_condattr_getclock;
     pthread_condattr_destroy;
   }
 
@@ -65,6 +66,7 @@ libc {
     pthread_attr_setstackaddr;
     pthread_attr_setstack;
     pthread_attr_setguardsize;
+    pthread_condattr_getclock;
   }
 
 
@@ -121,7 +123,6 @@ libpthread {
     pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init;
     pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait;
 
-    pthread_condattr_getclock;
     pthread_condattr_getpshared; pthread_condattr_init;
     pthread_condattr_setclock; pthread_condattr_setpshared;
 
diff --git a/sysdeps/htl/pt-condattr-getclock.c 
b/sysdeps/htl/pt-condattr-getclock.c
index a1ac71b038..cea53f484f 100644
--- a/sysdeps/htl/pt-condattr-getclock.c
+++ b/sysdeps/htl/pt-condattr-getclock.c
@@ -17,13 +17,18 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
+#include <shlib-compat.h>
 #include <time.h>
-
 #include <pt-internal.h>
 
 int
-pthread_condattr_getclock (const pthread_condattr_t *attr, clockid_t * clock)
+__pthread_condattr_getclock (const pthread_condattr_t *attr, clockid_t * clock)
 {
   *clock = attr->__clock;
   return 0;
 }
+versioned_symbol (libc, __pthread_condattr_getclock, 
pthread_condattr_getclock, GLIBC_2_41);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_condattr_getclock, 
pthread_condattr_getclock, GLIBC_2_12);
+#endif
diff --git a/sysdeps/mach/hurd/i386/libc.abilist 
b/sysdeps/mach/hurd/i386/libc.abilist
index 5069319b59..72c09131ac 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -50,6 +50,7 @@ GLIBC_2.12 pthread_attr_setstack F
 GLIBC_2.12 pthread_attr_setstackaddr F
 GLIBC_2.12 pthread_attr_setstacksize F
 GLIBC_2.12 pthread_condattr_destroy F
+GLIBC_2.12 pthread_condattr_getclock F
 GLIBC_2.12 pthread_equal F
 GLIBC_2.12 pthread_getschedparam F
 GLIBC_2.12 pthread_self F
@@ -2504,6 +2505,7 @@ GLIBC_2.41 pthread_attr_setguardsize F
 GLIBC_2.41 pthread_attr_setstack F
 GLIBC_2.41 pthread_attr_setstackaddr F
 GLIBC_2.41 pthread_attr_setstacksize F
+GLIBC_2.41 pthread_condattr_getclock F
 GLIBC_2.5 __readlinkat_chk F
 GLIBC_2.5 inet6_opt_append F
 GLIBC_2.5 inet6_opt_find F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist 
b/sysdeps/mach/hurd/i386/libpthread.abilist
index 7000b009ed..819e74abd1 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -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_getclock F
 GLIBC_2.12 pthread_condattr_getpshared F
 GLIBC_2.12 pthread_condattr_init F
 GLIBC_2.12 pthread_condattr_setclock F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist 
b/sysdeps/mach/hurd/x86_64/libc.abilist
index f147fcb5c2..c070d6c4ee 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1538,6 +1538,7 @@ 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_destroy F
+GLIBC_2.38 pthread_condattr_getclock F
 GLIBC_2.38 pthread_condattr_init F
 GLIBC_2.38 pthread_equal F
 GLIBC_2.38 pthread_exit F
@@ -2200,6 +2201,7 @@ GLIBC_2.41 pthread_attr_setguardsize F
 GLIBC_2.41 pthread_attr_setstack F
 GLIBC_2.41 pthread_attr_setstackaddr F
 GLIBC_2.41 pthread_attr_setstacksize F
+GLIBC_2.41 pthread_condattr_getclock F
 HURD_CTHREADS_0.3 __cthread_getspecific F
 HURD_CTHREADS_0.3 __cthread_keycreate F
 HURD_CTHREADS_0.3 __cthread_setspecific F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist 
b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 91da561235..6397cd5fe5 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -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_getclock F
 GLIBC_2.38 pthread_condattr_getpshared F
 GLIBC_2.38 pthread_condattr_init F
 GLIBC_2.38 pthread_condattr_setclock F
-- 
2.45.2