htl: move pthread_getattr_np into libc.

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

diff --git a/htl/Makefile b/htl/Makefile
index ecfa3c1779f949af60257fde61b70cb2c3ac9cf8..64e484c589b43850cca259585a9085f6d8b4d96f 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -26,7 +26,6 @@ LCLHDRS :=
 
 libpthread-routines := \
   pt-create \
-  pt-getattr \
   pt-detach \
   pt-exit \
   pt-initialize \
@@ -144,6 +143,7 @@ routines := \
   pt-dealloc \
   pt-destroy-specific \
   pt-docancel \
+  pt-getattr \
   pt-getconcurrency \
   pt-getcpuclockid \
   pt-getschedparam \

diff --git a/htl/Versions b/htl/Versions
index 0f2274591454aa901b807ac47eeffcf1e79fc5fe..c94bd61500b44b9821181a52ae4200e6157742a9 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -51,6 +51,7 @@ libc {
     pthread_condattr_getpshared;
     pthread_condattr_setclock;
     pthread_condattr_setpshared;
+    pthread_getattr_np;
     pthread_getconcurrency;
     pthread_key_create;
     pthread_key_delete;
@@ -197,6 +198,7 @@ libc {
 
   GLIBC_2.43 {
     pthread_cancel;
+    pthread_getattr_np;
     pthread_getconcurrency;
     pthread_getcpuclockid;
     pthread_kill;
@@ -293,8 +295,6 @@ libpthread {
 
     pthread_create; pthread_detach; pthread_exit;
 
-    pthread_getattr_np;
-
     pthread_join;
 
     pthread_mutex_transfer_np;
@@ -341,7 +341,6 @@ libpthread {
     __cthread_keycreate;
     __cthread_getspecific;
     __cthread_setspecific;
-    __pthread_getattr_np;
     __pthread_enable_asynccancel;
     __pthread_disable_asynccancel;
   }

diff --git a/htl/pt-getattr.c b/htl/pt-getattr.c
index a851514709f1ebe929b8f677d335e674cd4539d4..74b86ca76762c79803a6397a386990f04de9d26d 100644 (file)
--- a/htl/pt-getattr.c
+++ b/htl/pt-getattr.c
@@ -21,6 +21,8 @@
 #include <pthread.h>
 
 #include <pt-internal.h>
+#include <shlib-compat.h>
+#include <ldsodefs.h>
 
 /* Initialize thread attribute *ATTR with attributes corresponding to the
    already running thread THREAD.  It shall be called on an uninitialized ATTR
@@ -48,4 +50,9 @@ __pthread_getattr_np (pthread_t thread, pthread_attr_t *attr)
 
   return 0;
 }
-weak_alias (__pthread_getattr_np, pthread_getattr_np)
+libc_hidden_def (__pthread_getattr_np)
+versioned_symbol (libc, __pthread_getattr_np, pthread_getattr_np, GLIBC_2_43);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43)
+compat_symbol (libpthread, __pthread_getattr_np, pthread_getattr_np, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index dd9d77776f5bd1179c1ef8c44957785333b220a5..0deea22e8a23c84d4ddf5c6daae1d5fe7ef941f6 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -196,6 +196,7 @@ libc_hidden_proto (__pthread_key_delete)
 int __pthread_once (pthread_once_t *once_control, void (*init_routine) (void));
 
 int __pthread_getattr_np (pthread_t, pthread_attr_t *);
+libc_hidden_proto (__pthread_getattr_np)
 int __pthread_attr_getstackaddr (const pthread_attr_t *__restrict __attr,
                                 void **__restrict __stackaddr);
 libc_hidden_proto (__pthread_attr_getstackaddr)

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index a676cd0f75df8dca31723aa76048cf923b3a7d1b..0cbff57785b2f9293048cbd7ac23a9f1cdf1ae2e 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -73,6 +73,7 @@ GLIBC_2.12 pthread_condattr_init F
 GLIBC_2.12 pthread_condattr_setclock F
 GLIBC_2.12 pthread_condattr_setpshared F
 GLIBC_2.12 pthread_equal F
+GLIBC_2.12 pthread_getattr_np F
 GLIBC_2.12 pthread_getconcurrency F
 GLIBC_2.12 pthread_getcpuclockid F
 GLIBC_2.12 pthread_getschedparam F
@@ -2643,6 +2644,7 @@ GLIBC_2.42 uimaxabs F
 GLIBC_2.42 ulabs F
 GLIBC_2.42 ullabs F
 GLIBC_2.43 pthread_cancel F
+GLIBC_2.43 pthread_getattr_np F
 GLIBC_2.43 pthread_getconcurrency F
 GLIBC_2.43 pthread_getcpuclockid F
 GLIBC_2.43 pthread_kill F
@@ -2715,6 +2717,7 @@ HURD_CTHREADS_0.3 __mutex_lock_solid F
 HURD_CTHREADS_0.3 __mutex_trylock F
 HURD_CTHREADS_0.3 __mutex_unlock F
 HURD_CTHREADS_0.3 __mutex_unlock_solid F
+HURD_CTHREADS_0.3 __pthread_getattr_np F
 HURD_CTHREADS_0.3 __spin_lock F
 HURD_CTHREADS_0.3 __spin_lock_init F
 HURD_CTHREADS_0.3 __spin_lock_solid F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 044fb1c35530f1b32955cbfd8c12885476f81c86..3d225166884df056567d83deecb8b643a042ad0b 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -22,7 +22,6 @@ GLIBC_2.12 pthread_atfork F
 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_join F
 GLIBC_2.12 pthread_mutex_transfer_np F
 GLIBC_2.12 pthread_spin_destroy F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index dff8eee881efd82bc770c3a6afba271ae711c23b..2b983e489d4199c98ff955895c588cedf2ee5458 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1556,6 +1556,7 @@ GLIBC_2.38 pthread_condattr_setclock F
 GLIBC_2.38 pthread_condattr_setpshared F
 GLIBC_2.38 pthread_equal F
 GLIBC_2.38 pthread_exit F
+GLIBC_2.38 pthread_getattr_np F
 GLIBC_2.38 pthread_getconcurrency F
 GLIBC_2.38 pthread_getcpuclockid F
 GLIBC_2.38 pthread_getschedparam F
@@ -2325,6 +2326,7 @@ GLIBC_2.42 uimaxabs F
 GLIBC_2.42 ulabs F
 GLIBC_2.42 ullabs F
 GLIBC_2.43 pthread_cancel F
+GLIBC_2.43 pthread_getattr_np F
 GLIBC_2.43 pthread_getconcurrency F
 GLIBC_2.43 pthread_getcpuclockid F
 GLIBC_2.43 pthread_kill F
@@ -2341,6 +2343,7 @@ HURD_CTHREADS_0.3 __mutex_lock_solid F
 HURD_CTHREADS_0.3 __mutex_trylock F
 HURD_CTHREADS_0.3 __mutex_unlock F
 HURD_CTHREADS_0.3 __mutex_unlock_solid F
+HURD_CTHREADS_0.3 __pthread_getattr_np F
 HURD_CTHREADS_0.3 __spin_lock F
 HURD_CTHREADS_0.3 __spin_lock_init F
 HURD_CTHREADS_0.3 __spin_lock_solid F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 66f06f82b3198363d688902bdd04ae0306573bde..cf451505396f79e50f119b6223bff449f461a0b7 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -40,7 +40,6 @@ GLIBC_2.38 pthread_clockjoin_np F
 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_hurd_cond_timedwait_np F
 GLIBC_2.38 pthread_hurd_cond_wait_np F
 GLIBC_2.38 pthread_join F