htl: move sem_getvalue into libc.

Message-ID: <20250817104023.91919-3-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index e4a3adc99cb3269406a5e1692cc2ac28ab78eac4..8991a312d0bfbbf78bc15201cfb4786dffd53d75 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -35,7 +35,6 @@ libpthread-routines := \
   pt-getname-np \
   pt-setname-np \
   sem_close \
-  sem-getvalue \
   sem-init \
   sem_open \
   sem-post \
@@ -211,6 +210,7 @@ routines := \
   pt-wakeup \
   pt-yield \
   sem-destroy \
+  sem-getvalue \
   # routines
 shared-only-routines = forward
 

diff --git a/htl/Versions b/htl/Versions
index 48e7fcead40308c32f663a7e9def7cc512e3c768..5ede53de164eba328f2ee70c02866cdc20cec3bc 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -102,6 +102,7 @@ libc {
     pthread_testcancel;
     pthread_yield;
     sem_destroy;
+    sem_getvalue;
   }
 
   GLIBC_2.21 {
@@ -221,6 +222,7 @@ libc {
     pthread_tryjoin_np;
     pthread_yield;
     sem_destroy;
+    sem_getvalue;
   }
 
   GLIBC_PRIVATE {
@@ -313,7 +315,7 @@ libpthread {
 
     pthread_create;
 
-    sem_close; sem_getvalue; sem_init; sem_open; sem_post;
+    sem_close; sem_init; sem_open; sem_post;
     sem_timedwait; sem_trywait; sem_unlink; sem_wait;
 
     pthread_spin_destroy; pthread_spin_init; pthread_spin_lock;

diff --git a/sysdeps/htl/sem-getvalue.c b/sysdeps/htl/sem-getvalue.c
index a1f7bca9cb857a0a447abb7bd9f67f5d130a6f4f..799ddacc9b938cf3fae45d61fa83d0866c61acac 100644 (file)
--- a/sysdeps/htl/sem-getvalue.c
+++ b/sysdeps/htl/sem-getvalue.c
@@ -18,6 +18,7 @@
 
 #include <semaphore.h>
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 int
 __sem_getvalue (sem_t *restrict sem, int *restrict value)
@@ -33,4 +34,7 @@ __sem_getvalue (sem_t *restrict sem, int *restrict value)
   return 0;
 }
 
-strong_alias (__sem_getvalue, sem_getvalue);
+versioned_symbol (libc, __sem_getvalue, sem_getvalue, GLIBC_2_43);
+# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43)
+compat_symbol (libpthread, __sem_getvalue, sem_getvalue, GLIBC_2_12);
+#endif

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 80bf6408efb8ccc3906a56d4ebd437551855db45..74f1fc960d7cfb864c54a0ef5765f4df64e36707 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -129,6 +129,7 @@ GLIBC_2.12 pthread_sigmask F
 GLIBC_2.12 pthread_testcancel F
 GLIBC_2.12 pthread_yield F
 GLIBC_2.12 sem_destroy F
+GLIBC_2.12 sem_getvalue F
 GLIBC_2.13 __fentry__ F
 GLIBC_2.14 syncfs F
 GLIBC_2.15 __fdelt_chk F
@@ -2668,6 +2669,7 @@ GLIBC_2.43 pthread_timedjoin_np F
 GLIBC_2.43 pthread_tryjoin_np F
 GLIBC_2.43 pthread_yield F
 GLIBC_2.43 sem_destroy F
+GLIBC_2.43 sem_getvalue 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 99fdf00e1464a2bd016735c38569c8011a22df19..310f7ecfdc8f3da0a8f125cb1663a2b5cbb9b93e 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -25,7 +25,6 @@ GLIBC_2.12 pthread_spin_lock F
 GLIBC_2.12 pthread_spin_trylock F
 GLIBC_2.12 pthread_spin_unlock F
 GLIBC_2.12 sem_close F
-GLIBC_2.12 sem_getvalue F
 GLIBC_2.12 sem_init F
 GLIBC_2.12 sem_open F
 GLIBC_2.12 sem_post F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index b3d402f059162bbd15cc489b677aa60b6bc25b3c..dd18c695760a47ececb25b8e6e53d8e3a6d0608f 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1760,6 +1760,7 @@ GLIBC_2.38 seed48_r F
 GLIBC_2.38 seekdir F
 GLIBC_2.38 select F
 GLIBC_2.38 sem_destroy F
+GLIBC_2.38 sem_getvalue F
 GLIBC_2.38 semctl F
 GLIBC_2.38 semget F
 GLIBC_2.38 semop F
@@ -2349,6 +2350,7 @@ GLIBC_2.43 pthread_timedjoin_np F
 GLIBC_2.43 pthread_tryjoin_np F
 GLIBC_2.43 pthread_yield F
 GLIBC_2.43 sem_destroy F
+GLIBC_2.43 sem_getvalue 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 a03bebdf9eec0904470a2f2876e0fde3dbc22635..41c18cc94548184c2d12743587d8080ed1a818eb 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -45,7 +45,6 @@ GLIBC_2.38 pthread_spin_trylock F
 GLIBC_2.38 pthread_spin_unlock F
 GLIBC_2.38 sem_clockwait F
 GLIBC_2.38 sem_close F
-GLIBC_2.38 sem_getvalue F
 GLIBC_2.38 sem_init F
 GLIBC_2.38 sem_open F
 GLIBC_2.38 sem_post F