htl: move sem_unlink into libc.

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

diff --git a/htl/Makefile b/htl/Makefile
index 56b29e6bfd8e0b2e271f9f2f1fc8160201e12420..979f2904645ce00321bcc59dbe937d9314a4a72f 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -34,7 +34,6 @@ libpthread-routines := \
   pt-spin \
   pt-getname-np \
   pt-setname-np \
-  sem_unlink \
   cancellation \
   cthreads-compat \
   herrno \
@@ -211,6 +210,7 @@ routines := \
   sem_close \
   sem_open \
   sem_routines \
+  sem_unlink \
   # routines
 shared-only-routines = forward
 

diff --git a/htl/Versions b/htl/Versions
index c22b1b07f3a92e2ce702bb048e331b28331219b4..f5ea540def7768f8de5615e560dbe681ee94bb27 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -109,6 +109,7 @@ libc {
     sem_post;
     sem_timedwait;
     sem_trywait;
+    sem_unlink;
     sem_wait;
   }
 
@@ -239,6 +240,7 @@ libc {
     sem_post;
     sem_timedwait;
     sem_trywait;
+    sem_unlink;
     sem_wait;
   }
 
@@ -332,8 +334,6 @@ libpthread {
 
     pthread_create;
 
-    sem_unlink;
-
     pthread_spin_destroy; pthread_spin_init; pthread_spin_lock;
     pthread_spin_trylock; pthread_spin_unlock;
     __pthread_spin_destroy; __pthread_spin_init;

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 8eabddcec6e13f634cf90d361139cfb25c289dd4..b3fe424501229a28dab8fb1640ab7aecb837ce78 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -136,6 +136,7 @@ GLIBC_2.12 sem_open F
 GLIBC_2.12 sem_post F
 GLIBC_2.12 sem_timedwait F
 GLIBC_2.12 sem_trywait F
+GLIBC_2.12 sem_unlink F
 GLIBC_2.12 sem_wait F
 GLIBC_2.13 __fentry__ F
 GLIBC_2.14 syncfs F
@@ -2685,6 +2686,7 @@ GLIBC_2.43 sem_open F
 GLIBC_2.43 sem_post F
 GLIBC_2.43 sem_timedwait F
 GLIBC_2.43 sem_trywait F
+GLIBC_2.43 sem_unlink F
 GLIBC_2.43 sem_wait F
 GLIBC_2.5 __readlinkat_chk F
 GLIBC_2.5 inet6_opt_append F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 483d7927277d6957aca1c7e29cb28758406f825f..a05cacf93f91ad5e45445c75073a4c3d789e68d6 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -24,7 +24,6 @@ GLIBC_2.12 pthread_spin_init F
 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_unlink F
 GLIBC_2.2.6 _IO_flockfile F
 GLIBC_2.2.6 _IO_ftrylockfile F
 GLIBC_2.2.6 _IO_funlockfile F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index de42acab3de4023d54e3750c965b2cf4a3b07ce4..56da3c562b367ea1782a24977eceaedb0d4a92e1 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1768,6 +1768,7 @@ GLIBC_2.38 sem_open F
 GLIBC_2.38 sem_post F
 GLIBC_2.38 sem_timedwait F
 GLIBC_2.38 sem_trywait F
+GLIBC_2.38 sem_unlink F
 GLIBC_2.38 sem_wait F
 GLIBC_2.38 semctl F
 GLIBC_2.38 semget F
@@ -2366,6 +2367,7 @@ GLIBC_2.43 sem_open F
 GLIBC_2.43 sem_post F
 GLIBC_2.43 sem_timedwait F
 GLIBC_2.43 sem_trywait F
+GLIBC_2.43 sem_unlink F
 GLIBC_2.43 sem_wait F
 HURD_CTHREADS_0.3 __cthread_getspecific F
 HURD_CTHREADS_0.3 __cthread_keycreate F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 4c9ba3b7d5211150e10addad3c60db714429935d..0b1dcf1e8a28a14897dc626804b6f96d0bba9f39 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -43,7 +43,6 @@ GLIBC_2.38 pthread_spin_init F
 GLIBC_2.38 pthread_spin_lock F
 GLIBC_2.38 pthread_spin_trylock F
 GLIBC_2.38 pthread_spin_unlock F
-GLIBC_2.38 sem_unlink F
 GLIBC_2.38 thrd_create F
 GLIBC_2.38 thrd_detach F
 GLIBC_2.38 thrd_exit F

diff --git a/sysdeps/pthread/sem_unlink.c b/sysdeps/pthread/sem_unlink.c
index 428a93ae4970863efaee57e49df996676c5c9c21..bf09bfd1a6b21648a4ad58af0abf4a5d49ad2303 100644 (file)
--- a/sysdeps/pthread/sem_unlink.c
+++ b/sysdeps/pthread/sem_unlink.c
@@ -22,11 +22,7 @@
 #include <unistd.h>
 #include "semaphoreP.h"
 #include <shm-directory.h>
-
-#if !PTHREAD_IN_LIBC
-/* The private name is not exported from libc.  */
-# define __unlink unlink
-#endif
+#include <shlib-compat.h>
 
 int
 __sem_unlink (const char *name)
@@ -44,11 +40,14 @@ __sem_unlink (const char *name)
     __set_errno (EACCES);
   return ret;
 }
-#if PTHREAD_IN_LIBC
+#ifndef __PTHREAD_HTL
 versioned_symbol (libc, __sem_unlink, sem_unlink, GLIBC_2_34);
 # if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1_1, GLIBC_2_34)
 compat_symbol (libpthread, __sem_unlink, sem_unlink, GLIBC_2_1_1);
 # endif
-#else /* !PTHREAD_IN_LIBC */
-strong_alias (__sem_unlink, sem_unlink)
+#else /* __PTHREAD_HTL */
+versioned_symbol (libc, __sem_unlink, sem_unlink, GLIBC_2_43);
+# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43)
+compat_symbol (libpthread, __sem_unlink, sem_unlink, GLIBC_2_12);
+#endif
 #endif