htl: move pthread_setschedprio into libc.

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

diff --git a/htl/Makefile b/htl/Makefile
index 82b7803c88c9e258daa7a8d51f931f034332feac..0f9e567faa9f01628ce7f4b265850d2e3dffdff9 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -55,7 +55,6 @@ libpthread-routines := \
   pt-sigstate-init \
   pt-kill \
   pt-getcpuclockid \
-  pt-setschedprio \
   pt-yield \
   pt-getname-np \
   pt-setname-np \
@@ -204,6 +203,7 @@ routines := \
   pt-setcancelstate \
   pt-setcanceltype \
   pt-setschedparam \
+  pt-setschedprio \
   pt-setspecific \
   pt-sigmask \
   pt-sigstate \

diff --git a/htl/Versions b/htl/Versions
index 40ee2748a795f617a6e882011b44541020e19531..57041917aaff4d85707319952345d44fa1cc2637 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -84,6 +84,7 @@ libc {
     pthread_rwlockattr_setpshared;
     pthread_setcancelstate;
     pthread_setcanceltype;
+    pthread_setschedprio;
     pthread_setspecific;
     pthread_sigmask;
   }
@@ -186,6 +187,10 @@ libc {
     pthread_setspecific;
   }
 
+  GLIBC_2.43 {
+    pthread_setschedprio;
+  }
+
   GLIBC_PRIVATE {
     __libc_alloca_cutoff;
     __libc_pthread_init;
@@ -276,7 +281,6 @@ libpthread {
     pthread_mutex_transfer_np;
 
     pthread_setconcurrency;
-    pthread_setschedprio;
 
     pthread_testcancel;
     pthread_yield;

diff --git a/sysdeps/htl/pt-setschedprio.c b/sysdeps/htl/pt-setschedprio.c
index 7e1429c48f52234156d1ee490cafbbb8e4a2d19c..198fcc88b0b2f241a59190ef9e0fa0c305b04cdb 100644 (file)
--- a/sysdeps/htl/pt-setschedprio.c
+++ b/sysdeps/htl/pt-setschedprio.c
@@ -18,11 +18,18 @@
 
 #include <pthread.h>
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 int
-pthread_setschedprio (pthread_t thread, int prio)
+__pthread_setschedprio (pthread_t thread, int prio)
 {
   return ENOSYS;
 }
 
+libc_hidden_def (__pthread_setschedprio)
+versioned_symbol (libc, __pthread_setschedprio, pthread_setschedprio, GLIBC_2_43);
 stub_warning (pthread_setschedprio)
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43)
+compat_symbol (libc, __pthread_setschedprio, pthread_setschedprio, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 535740f5ea399d2a6cd83b3ef50464d2e04c89d7..384e39d2118f95b20bd5e899eec919c6172c6045 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -138,6 +138,9 @@ extern int __pthread_rwlockattr_setpshared (pthread_rwlockattr_t *__attr,
                                          int __pshared);
 libc_hidden_proto (__pthread_rwlockattr_setpshared)
 
+extern int __pthread_setschedprio (pthread_t __thr, int __prio);
+libc_hidden_proto (__pthread_setschedprio)
+
 extern int __pthread_cond_init (pthread_cond_t *cond,
                                const pthread_condattr_t *cond_attr);
 libc_hidden_proto (__pthread_cond_init)

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index aac3cb3319dd4b7873a8733af9c87590ac5ecfa5..5ba3b7f356a8201df55abbb7679e84c1ed1732bc 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -111,6 +111,7 @@ GLIBC_2.12 pthread_self F
 GLIBC_2.12 pthread_setcancelstate F
 GLIBC_2.12 pthread_setcanceltype F
 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.13 __fentry__ F
@@ -2633,6 +2634,7 @@ GLIBC_2.42 uabs F
 GLIBC_2.42 uimaxabs F
 GLIBC_2.42 ulabs F
 GLIBC_2.42 ullabs F
+GLIBC_2.43 pthread_setschedprio 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 9d2c4cd7428a274aec5730743b44915f1c3cae6a..23df0ad6d190cb9119c228d4bf20db047beb1c98 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -31,7 +31,6 @@ GLIBC_2.12 pthread_join F
 GLIBC_2.12 pthread_kill F
 GLIBC_2.12 pthread_mutex_transfer_np F
 GLIBC_2.12 pthread_setconcurrency F
-GLIBC_2.12 pthread_setschedprio F
 GLIBC_2.12 pthread_spin_destroy F
 GLIBC_2.12 pthread_spin_init F
 GLIBC_2.12 pthread_spin_lock F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 8f9d6aa842b0e5665c2f1f4f1cd0e385750becc1..06a85b5d4001be7df608f3fb87109a31bcc1037e 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1603,6 +1603,7 @@ GLIBC_2.38 pthread_self F
 GLIBC_2.38 pthread_setcancelstate F
 GLIBC_2.38 pthread_setcanceltype F
 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 ptrace F
@@ -2315,6 +2316,7 @@ GLIBC_2.42 uabs F
 GLIBC_2.42 uimaxabs F
 GLIBC_2.42 ulabs F
 GLIBC_2.42 ullabs F
+GLIBC_2.43 pthread_setschedprio 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 81d355a94b3345b6b0b4e07c2bbe79bf6372b6ad..21555b7bd8618eb6218ce1823461af3b73e805df 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -51,7 +51,6 @@ GLIBC_2.38 pthread_join F
 GLIBC_2.38 pthread_kill F
 GLIBC_2.38 pthread_mutex_transfer_np F
 GLIBC_2.38 pthread_setconcurrency F
-GLIBC_2.38 pthread_setschedprio F
 GLIBC_2.38 pthread_spin_destroy F
 GLIBC_2.38 pthread_spin_init F
 GLIBC_2.38 pthread_spin_lock F