htl: move pthread_condattr_destroy into libc.

Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241126205329.2215295-2-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 25eb791031206f7d0f8f42a91785cb0a0a4c59e7..2658f2470c7ed8dfa3e4760c33ac8c31e2c7d103 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -94,7 +94,6 @@ libpthread-routines := \
   pt-rwlock-unlock \
   pt-cond \
   pt-condattr-init \
-  pt-condattr-destroy \
   pt-condattr-getclock \
   pt-condattr-getpshared \
   pt-condattr-setclock \
@@ -206,6 +205,7 @@ routines := \
   pt-attr-setstack \
   pt-attr-setstackaddr \
   pt-attr-setstacksize \
+  pt-condattr-destroy \
   pt-getschedparam \
   pt-nthreads \
   pt-pthread_self \

diff --git a/htl/Versions b/htl/Versions
index afc2495e2f609b5818ebd514b135d9ac4e06fcc5..12399ba147844df510d1642bab781097c418c565 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -26,6 +26,7 @@ libc {
     pthread_attr_setscope;
     pthread_attr_setschedparam;
     pthread_attr_init;
+    pthread_condattr_destroy;
   }
 
   GLIBC_2.21 {
@@ -119,7 +120,7 @@ libpthread {
     pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init;
     pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait;
 
-    pthread_condattr_destroy; pthread_condattr_getclock;
+    pthread_condattr_getclock;
     pthread_condattr_getpshared; pthread_condattr_init;
     pthread_condattr_setclock; pthread_condattr_setpshared;
 

diff --git a/htl/forward.c b/htl/forward.c
index 7c0e16dc6ee5748cc5a6e555d0fb4969fe2b9599..3fe0a74d0078388fe5fd738f1b686f1121e8da7f 100644 (file)
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -53,7 +53,6 @@ name decl                                                                   \
 #define FORWARD(name, decl, params, defretval) \
   FORWARD2 (name, int, decl, params, return defretval)
 
-FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
 FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
 
 

diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index b082a13b5438095c9926266d2ef176a28b56397e..632ee84773ca2cf45cf29084f0fd5921bbb68e94 100644 (file)
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -27,7 +27,6 @@
 
 #if IS_IN (libpthread)
 static const struct pthread_functions pthread_functions = {
-  .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
   .ptr_pthread_condattr_init = __pthread_condattr_init,
   .ptr_pthread_cond_broadcast = __pthread_cond_broadcast,
   .ptr_pthread_cond_destroy = __pthread_cond_destroy,

diff --git a/sysdeps/htl/pt-condattr-destroy.c b/sysdeps/htl/pt-condattr-destroy.c
index dc6a667a88c1584a40fac6dc23d08c178ad23dea..ec7ee5249db5a8a538ba33df9b418c4d655d55a9 100644 (file)
--- a/sysdeps/htl/pt-condattr-destroy.c
+++ b/sysdeps/htl/pt-condattr-destroy.c
@@ -17,6 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
+#include <shlib-compat.h>
 #include <pt-internal.h>
 
 int
@@ -24,5 +25,8 @@ __pthread_condattr_destroy (pthread_condattr_t *cond)
 {
   return 0;
 }
+versioned_symbol (libc, __pthread_condattr_destroy, pthread_condattr_destroy, GLIBC_2_21);
 
-weak_alias (__pthread_condattr_destroy, pthread_condattr_destroy);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
+compat_symbol (libc, __pthread_condattr_destroy, pthread_condattr_destroy, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index d380d17bc69b23b97c5f9b815a169f84aea509b5..6bd01682bb1c06bb9ec2c5d5e0f808e16c67b12d 100644 (file)
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -21,7 +21,6 @@
 
 #include <pthread.h>
 
-int __pthread_condattr_destroy (pthread_condattr_t *);
 int __pthread_condattr_init (pthread_condattr_t *);
 int __pthread_cond_broadcast (pthread_cond_t *);
 int __pthread_cond_destroy (pthread_cond_t *);
@@ -58,7 +57,6 @@ int _cthreads_ftrylockfile (FILE *);
    so if possible avoid breaking it and append new hooks to the end.  */
 struct pthread_functions
 {
-  int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
   int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
   int (*ptr_pthread_cond_broadcast) (pthread_cond_t *);
   int (*ptr_pthread_cond_destroy) (pthread_cond_t *);

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 101d5b8025a5eda4d47f0cae39b0b5a2a9497c47..5069319b59cdb7f83ef80d9d53f4d9f90835a2d5 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_condattr_destroy F
 GLIBC_2.12 pthread_equal F
 GLIBC_2.12 pthread_getschedparam F
 GLIBC_2.12 pthread_self F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 4e287c2e317cd9ad5dcf19cdee7f3e9a62ef8f22..7000b009edab1abf5d84867a2d0b3867433ba48e 100644 (file)
--- 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_destroy F
 GLIBC_2.12 pthread_condattr_getclock F
 GLIBC_2.12 pthread_condattr_getpshared F
 GLIBC_2.12 pthread_condattr_init F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 3396ea9e70b74c4f51ac404d8da1b81111ffcc77..91da5612356a6b8167c6e194546fdb982ab3adf2 100644 (file)
--- 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_destroy F
 GLIBC_2.38 pthread_condattr_getclock F
 GLIBC_2.38 pthread_condattr_getpshared F
 GLIBC_2.38 pthread_condattr_init F