htl: move pthread_cond_destroy into libc.

Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241219203727.669825-4-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 168b211905e20c1a1a77ce38d7573a8e9e1b12aa..c61112d66783950dffd4215a37d106ff4e5a56d0 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -91,7 +91,6 @@ libpthread-routines := \
   pt-rwlock-timedrdlock \
   pt-rwlock-timedwrlock \
   pt-rwlock-unlock \
-  pt-cond-destroy \
   pt-cond-brdcast \
   pt-cond-signal \
   pt-cond-wait \
@@ -195,6 +194,7 @@ routines := \
   pt-attr-setstackaddr \
   pt-attr-setstacksize \
   pt-cond \
+  pt-cond-destroy \
   pt-cond-init \
   pt-condattr-destroy \
   pt-condattr-getclock \

diff --git a/htl/Versions b/htl/Versions
index 996626df2f7c01b20b20371d1a8333b47fc712b7..30f7d03aeb0fb2667687610a7afd649a6d7cd96b 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -26,6 +26,7 @@ libc {
     pthread_attr_setscope;
     pthread_attr_setschedparam;
     pthread_attr_init;
+    pthread_cond_destroy;
     pthread_cond_init;
     pthread_condattr_getclock;
     pthread_condattr_init;
@@ -95,6 +96,7 @@ libc {
     __pthread_attr_setstacksize;
     __pthread_attr_setstackaddr;
     __pthread_attr_setstack;
+    __pthread_cond_destroy;
     __pthread_cond_init;
     __pthread_condattr_init;
     __pthread_default_condattr;
@@ -136,7 +138,7 @@ libpthread {
 
     pthread_cancel;
 
-    pthread_cond_broadcast; pthread_cond_destroy;
+    pthread_cond_broadcast;
     pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait;
 
     pthread_create; pthread_detach; pthread_exit;

diff --git a/htl/forward.c b/htl/forward.c
index eb83eaeda1ed4d89a6dc4cb56b75861a1c5a947c..7731b84d049073d15bd410109ef630f8eb829fc1 100644 (file)
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -54,7 +54,6 @@ name decl                                                                   \
   FORWARD2 (name, int, decl, params, return defretval)
 
 FORWARD (pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
-FORWARD (pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0)
 FORWARD (pthread_cond_signal, (pthread_cond_t *cond), (cond), 0)
 FORWARD (pthread_cond_wait, (pthread_cond_t *cond, pthread_mutex_t *mutex),
         (cond, mutex), 0)

diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 051bc09e940a227ce33241e18252e83aef21a3f9..1b147b947a0f0b630f2b8b9bc529f22403ba0764 100644 (file)
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -28,7 +28,6 @@
 #if IS_IN (libpthread)
 static const struct pthread_functions pthread_functions = {
   .ptr_pthread_cond_broadcast = __pthread_cond_broadcast,
-  .ptr_pthread_cond_destroy = __pthread_cond_destroy,
   .ptr_pthread_cond_signal = __pthread_cond_signal,
   .ptr_pthread_cond_wait = __pthread_cond_wait,
   .ptr_pthread_cond_timedwait = __pthread_cond_timedwait,

diff --git a/sysdeps/htl/pt-cond-destroy.c b/sysdeps/htl/pt-cond-destroy.c
index e3660dbb5d658580391383014ed97fce6662bb1c..066dd1f424388f259ac98fca02aa4ad93c798a4d 100644 (file)
--- a/sysdeps/htl/pt-cond-destroy.c
+++ b/sysdeps/htl/pt-cond-destroy.c
@@ -18,6 +18,7 @@
 
 #include <pthread.h>
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 int
 __pthread_cond_destroy (pthread_cond_t *cond)
@@ -43,5 +44,9 @@ __pthread_cond_destroy (pthread_cond_t *cond)
 
   return 0;
 }
+libc_hidden_def (__pthread_cond_destroy)
+versioned_symbol (libc, __pthread_cond_destroy, pthread_cond_destroy, GLIBC_2_21);
 
-weak_alias (__pthread_cond_destroy, pthread_cond_destroy);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
+compat_symbol (libc, __pthread_cond_destroy, pthread_cond_destroy, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 87e75ca8044ec2e1952ce0a5ebbb689ebe9d554e..99510615ddd9cd90f5762bef24f0e00cff96930c 100644 (file)
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -22,7 +22,6 @@
 #include <pthread.h>
 
 int __pthread_cond_broadcast (pthread_cond_t *);
-int __pthread_cond_destroy (pthread_cond_t *);
 int __pthread_cond_signal (pthread_cond_t *);
 int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
 int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *,
@@ -55,7 +54,6 @@ int _cthreads_ftrylockfile (FILE *);
 struct pthread_functions
 {
   int (*ptr_pthread_cond_broadcast) (pthread_cond_t *);
-  int (*ptr_pthread_cond_destroy) (pthread_cond_t *);
   int (*ptr_pthread_cond_signal) (pthread_cond_t *);
   int (*ptr_pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
   int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 64c86623c7f1579330829b5b3d24d561aa6c7c24..6d469b7eff5d105f01d70875374150ebcfc011e6 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -56,6 +56,7 @@ extern int __pthread_cond_clockwait (pthread_cond_t *cond,
                                     const struct timespec *abstime)
   __nonnull ((1, 2, 4));
 extern int __pthread_cond_destroy (pthread_cond_t *cond);
+libc_hidden_proto (__pthread_cond_destroy);
 extern int __pthread_sigmask (int, const sigset_t *, sigset_t *);
 libc_hidden_proto (__pthread_sigmask);
 

diff --git a/sysdeps/htl/timer_routines.c b/sysdeps/htl/timer_routines.c
index 0992ea39113b1503cc955cf90989c6bfdb4637f1..7e2a56139e294abb47fd7143aacc870b8c942acc 100644 (file)
--- a/sysdeps/htl/timer_routines.c
+++ b/sysdeps/htl/timer_routines.c
@@ -211,7 +211,7 @@ static void
 thread_deinit (struct thread_node *thread)
 {
   assert (list_isempty (&thread->timer_queue));
-  pthread_cond_destroy (&thread->cond);
+  __pthread_cond_destroy (&thread->cond);
 }
 
 

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index d5520a06581c574022f5345d2ccbb156f808937d..e251d09f5d18acc38253898288a22777cdbdbb63 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -49,6 +49,7 @@ GLIBC_2.12 pthread_attr_setscope F
 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_cond_destroy F
 GLIBC_2.12 pthread_cond_init F
 GLIBC_2.12 pthread_condattr_destroy F
 GLIBC_2.12 pthread_condattr_getclock F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 77eddcfe939e32c7fa091f606b44a089208803cd..b9d13b27eb7eae3fac7762e3614417b7c029b519 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -31,7 +31,6 @@ GLIBC_2.12 pthread_barrierattr_init F
 GLIBC_2.12 pthread_barrierattr_setpshared F
 GLIBC_2.12 pthread_cancel F
 GLIBC_2.12 pthread_cond_broadcast F
-GLIBC_2.12 pthread_cond_destroy F
 GLIBC_2.12 pthread_cond_signal F
 GLIBC_2.12 pthread_cond_timedwait F
 GLIBC_2.12 pthread_cond_wait F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 25bcc9dbea6d87484597e3b8ab308be0fb4e2f3a..154689e8590dc7cab93c53a78bb5cc387af39a9b 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -50,7 +50,6 @@ GLIBC_2.38 pthread_cancel F
 GLIBC_2.38 pthread_clockjoin_np F
 GLIBC_2.38 pthread_cond_broadcast F
 GLIBC_2.38 pthread_cond_clockwait F
-GLIBC_2.38 pthread_cond_destroy F
 GLIBC_2.38 pthread_cond_signal F
 GLIBC_2.38 pthread_cond_timedwait F
 GLIBC_2.38 pthread_cond_wait F