htl: move pthread_yield into libc.

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

diff --git a/htl/Makefile b/htl/Makefile
index be7db0ab5d10c3c35efce9a3201caa44db243e64..6c04a276b9145809486e0a7864d804519acfe2a2 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -45,7 +45,6 @@ libpthread-routines := \
   pt-spin \
   pt-sigstate-init \
   pt-kill \
-  pt-yield \
   pt-getname-np \
   pt-setname-np \
   sem_close \
@@ -211,6 +210,7 @@ routines := \
   pt-timedblock \
   pt-timedblock-intr \
   pt-wakeup \
+  pt-yield \
   # routines
 shared-only-routines = forward
 

diff --git a/htl/Versions b/htl/Versions
index 68c7f01ed08ce27991d987a3a936e4b48e4b8b37..e6bd128925962605e59902dbf820b81fb7ebe81a 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -90,6 +90,7 @@ libc {
     pthread_setschedprio;
     pthread_setspecific;
     pthread_sigmask;
+    pthread_yield;
   }
 
   GLIBC_2.21 {
@@ -195,6 +196,7 @@ libc {
     pthread_getcpuclockid;
     pthread_setconcurrency;
     pthread_setschedprio;
+    pthread_yield;
   }
 
   GLIBC_PRIVATE {
@@ -294,7 +296,6 @@ libpthread {
     pthread_mutex_transfer_np;
 
     pthread_testcancel;
-    pthread_yield;
 
     sem_close; sem_destroy; sem_getvalue; sem_init; sem_open; sem_post;
     sem_timedwait; sem_trywait; sem_unlink; sem_wait;

diff --git a/htl/pt-yield.c b/htl/pt-yield.c
index 0cab615a8ddaf2eabb6d49a2f817de7dd821c9e9..f9f0b6343761642b687f8bba3c80f5e8573bb30f 100644 (file)
--- a/htl/pt-yield.c
+++ b/htl/pt-yield.c
@@ -18,9 +18,16 @@
 
 #include <pthread.h>
 #include <sched.h>
+#include <shlib-compat.h>
+
 
 int
-pthread_yield (void)
+__pthread_yield (void)
 {
   return __sched_yield ();
 }
+versioned_symbol (libc, __pthread_yield, pthread_yield, GLIBC_2_43);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43)
+compat_symbol (libpthread, __pthread_yield, pthread_yield, GLIBC_2_12);
+#endif

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 791920f257ff63362f428c33d97b5c0faae63961..20cff5f14336b0877c8080d6dfa2504d28e8ca16 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -117,6 +117,7 @@ GLIBC_2.12 pthread_setschedparam F
 GLIBC_2.12 pthread_setschedprio F
 GLIBC_2.12 pthread_setspecific F
 GLIBC_2.12 pthread_sigmask F
+GLIBC_2.12 pthread_yield F
 GLIBC_2.13 __fentry__ F
 GLIBC_2.14 syncfs F
 GLIBC_2.15 __fdelt_chk F
@@ -2641,6 +2642,7 @@ GLIBC_2.43 pthread_getconcurrency F
 GLIBC_2.43 pthread_getcpuclockid F
 GLIBC_2.43 pthread_setconcurrency F
 GLIBC_2.43 pthread_setschedprio F
+GLIBC_2.43 pthread_yield 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 6c9ca8e1945c78635b5bf5b27e6b69a3ce6359cf..b3afc039e5e1727dbdab46e547934191c898a2c3 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -34,7 +34,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 pthread_testcancel F
-GLIBC_2.12 pthread_yield F
 GLIBC_2.12 sem_close F
 GLIBC_2.12 sem_destroy F
 GLIBC_2.12 sem_getvalue F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 0e03d9dc0501129b0c9178e396246c019aee2976..88d180fcf26e3ef10cfc2101b2a2046110b986ca 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1609,6 +1609,7 @@ GLIBC_2.38 pthread_setschedparam F
 GLIBC_2.38 pthread_setschedprio F
 GLIBC_2.38 pthread_setspecific F
 GLIBC_2.38 pthread_sigmask F
+GLIBC_2.38 pthread_yield F
 GLIBC_2.38 ptrace F
 GLIBC_2.38 ptsname F
 GLIBC_2.38 ptsname_r F
@@ -2323,6 +2324,7 @@ GLIBC_2.43 pthread_getconcurrency F
 GLIBC_2.43 pthread_getcpuclockid F
 GLIBC_2.43 pthread_setconcurrency F
 GLIBC_2.43 pthread_setschedprio F
+GLIBC_2.43 pthread_yield 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 e68935dc5eb6b6235e6122dafc037b078406731a..e76c359b1d802ccdf777229809c6a0634b71a80f 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -56,7 +56,6 @@ GLIBC_2.38 pthread_spin_unlock F
 GLIBC_2.38 pthread_testcancel F
 GLIBC_2.38 pthread_timedjoin_np F
 GLIBC_2.38 pthread_tryjoin_np F
-GLIBC_2.38 pthread_yield F
 GLIBC_2.38 sem_clockwait F
 GLIBC_2.38 sem_close F
 GLIBC_2.38 sem_destroy F