htl: move pthread_attr_setschedparam into libc.

Signed-off-by: gfleury <gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index eae1c7095849f9e31332421afbee3c6a3336b1ad..555ab9b8cd70eebc80c38a88a0ec817a887d656a 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -27,7 +27,6 @@ LCLHDRS :=
 libpthread-routines := \
   pt-attr-init \
   pt-attr-setguardsize \
-  pt-attr-setschedparam \
   pt-barrier-destroy \
   pt-barrier-init \
   pt-barrier-wait \
@@ -201,6 +200,7 @@ routines := \
   pt-attr-getstacksize \
   pt-attr-setdetachstate \
   pt-attr-setinheritsched \
+  pt-attr-setschedparam \
   pt-attr-setschedpolicy \
   pt-attr-setscope \
   pt-attr-setstack \

diff --git a/htl/Versions b/htl/Versions
index 01f9f27a37da4a0efabfee09da2cb342c332e438..8ecb2fd88052c011d178e1c607b64c66283407b2 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -23,6 +23,7 @@ libc {
     pthread_attr_setstackaddr;
     pthread_attr_setstack;
     pthread_attr_setscope;
+    pthread_attr_setschedparam;
   }
 
   GLIBC_2.21 {
@@ -107,7 +108,6 @@ libpthread {
 
     pthread_attr_init;
     pthread_attr_setguardsize;
-    pthread_attr_setschedparam;
 
     pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait;
     pthread_barrierattr_destroy; pthread_barrierattr_getpshared;

diff --git a/htl/forward.c b/htl/forward.c
index 105b46cfea6cf104eeb54e14e17079ec60985a26..179ec60bc5e03dbff8611e6582b6adcf4c423b0c 100644 (file)
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -55,10 +55,6 @@ name decl                                                                  \
 
 FORWARD (pthread_attr_init, (pthread_attr_t *attr), (attr), 0)
 
-FORWARD (pthread_attr_setschedparam,
-        (pthread_attr_t *attr, const struct sched_param *param),
-        (attr, param), 0)
-
 FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
 FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
 

diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 80afc5e86a28ed74af4c36f13b9e57e31b20d18d..835d7412158aff1ca8a5d215e2eafaf4ac4103c2 100644 (file)
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -28,7 +28,6 @@
 #if IS_IN (libpthread)
 static const struct pthread_functions pthread_functions = {
   .ptr_pthread_attr_init = __pthread_attr_init,
-  .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
   .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
   .ptr_pthread_condattr_init = __pthread_condattr_init,
   .ptr_pthread_cond_broadcast = __pthread_cond_broadcast,

diff --git a/sysdeps/htl/pt-attr-setschedparam.c b/sysdeps/htl/pt-attr-setschedparam.c
index 39a9cdf5edfe86e304676065a06493bb1231d53c..a60952fbb3b4c2838cf46470ed87de2e2fa8aa0c 100644 (file)
--- a/sysdeps/htl/pt-attr-setschedparam.c
+++ b/sysdeps/htl/pt-attr-setschedparam.c
@@ -19,7 +19,7 @@
 #include <pthread.h>
 #include <sched.h>
 #include <string.h>
-
+#include <shlib-compat.h>
 #include <pt-internal.h>
 
 int
@@ -34,5 +34,8 @@ __pthread_attr_setschedparam (pthread_attr_t *attr,
 
   return ENOTSUP;
 }
+versioned_symbol (libc, __pthread_attr_setschedparam, pthread_attr_setschedparam, GLIBC_2_21);
 
-weak_alias (__pthread_attr_setschedparam, pthread_attr_setschedparam);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
+compat_symbol (libc, __pthread_attr_setschedparam, pthread_attr_setschedparam, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 1c691db6f3df9947377219f202394cdd54b923b0..17c97ef2006235052f1d5c13e1ea89ecd6ac7218 100644 (file)
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -22,8 +22,6 @@
 #include <pthread.h>
 
 int __pthread_attr_init (pthread_attr_t *);
-int __pthread_attr_setschedparam (pthread_attr_t *,
-                                const struct sched_param *);
 int __pthread_condattr_destroy (pthread_condattr_t *);
 int __pthread_condattr_init (pthread_condattr_t *);
 int __pthread_cond_broadcast (pthread_cond_t *);
@@ -62,8 +60,6 @@ int _cthreads_ftrylockfile (FILE *);
 struct pthread_functions
 {
   int (*ptr_pthread_attr_init) (pthread_attr_t *);
-  int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *,
-                                        const struct sched_param *);
   int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
   int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
   int (*ptr_pthread_cond_broadcast) (pthread_cond_t *);

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 1c3d33821f5c3b0e393b4f1976a7b123b7b710b8..8fd21e66a19eef03f4a09084c30a634c54e10afb 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -41,6 +41,7 @@ GLIBC_2.12 pthread_attr_getstackaddr F
 GLIBC_2.12 pthread_attr_getstacksize F
 GLIBC_2.12 pthread_attr_setdetachstate F
 GLIBC_2.12 pthread_attr_setinheritsched F
+GLIBC_2.12 pthread_attr_setschedparam F
 GLIBC_2.12 pthread_attr_setschedpolicy F
 GLIBC_2.12 pthread_attr_setscope F
 GLIBC_2.12 pthread_attr_setstack F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 83e3a06dc3efe4676b7b01e49c0d7aebfeee8962..ea40657e1dcab6f47c03af7f0cbc99e36d2060a7 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -24,7 +24,6 @@ GLIBC_2.12 funlockfile F
 GLIBC_2.12 pthread_atfork F
 GLIBC_2.12 pthread_attr_init F
 GLIBC_2.12 pthread_attr_setguardsize F
-GLIBC_2.12 pthread_attr_setschedparam F
 GLIBC_2.12 pthread_barrier_destroy F
 GLIBC_2.12 pthread_barrier_init F
 GLIBC_2.12 pthread_barrier_wait F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index b4f54f5f5d3e1cd0aaab7bcb6abff3dd83716b50..eef91700e979d5a8973ddf34ed7f68a0293365c1 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -41,7 +41,6 @@ GLIBC_2.38 mtx_trylock F
 GLIBC_2.38 mtx_unlock F
 GLIBC_2.38 pthread_attr_init F
 GLIBC_2.38 pthread_attr_setguardsize F
-GLIBC_2.38 pthread_attr_setschedparam F
 GLIBC_2.38 pthread_barrier_destroy F
 GLIBC_2.38 pthread_barrier_init F
 GLIBC_2.38 pthread_barrier_wait F