[glibc] htl: move pthread_getschedparam into libc

[glibc] htl: move pthread_getschedparam into libc

[Samuel Thibault]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a1a942fb5f786ebcc71631de020e05d6b6343985

commit a1a942fb5f786ebcc71631de020e05d6b6343985
Author: Guy-Fleury Iteriteka <gfleury@disroot.org>
Date:   Sun Jul 16 10:44:06 2023 +0200

    htl: move pthread_getschedparam into libc
    
    Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
    Message-Id: <20230716084414.107245-3-gfleury@disroot.org>

Diff:
---
 htl/Makefile                                | 5 +++--
 htl/Versions                                | 2 +-
 htl/forward.c                               | 4 ----
 htl/pt-initialize.c                         | 1 -
 sysdeps/htl/pthread-functions.h             | 2 --
 sysdeps/mach/hurd/i386/libpthread.abilist   | 1 -
 sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 -
 7 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index b131aa19ab..9362a58393 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -122,7 +122,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate	    \
 	pt-kill								    \
 	pt-getcpuclockid						    \
 									    \
-	pt-getschedparam pt-setschedparam pt-setschedprio		    \
+	pt-setschedparam pt-setschedprio		                    \
 	pt-yield							    \
 									    \
 	sem_close sem-destroy sem-getvalue sem-init sem_open		    \
@@ -164,7 +164,8 @@ headers :=				\
 
 distribute :=
 
-routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal
+routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal \
+	pt-getschedparam
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index c2be77997b..f376bf2f18 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -94,7 +94,7 @@ libpthread {
     pthread_getattr_np;
 
     pthread_getconcurrency; pthread_getcpuclockid;
-    pthread_getschedparam; pthread_getspecific;
+    pthread_getspecific;
 
     pthread_join;
 
diff --git a/htl/forward.c b/htl/forward.c
index a8147d362c..df0d4ecc65 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -107,10 +107,6 @@ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
 		  exit (EXIT_SUCCESS))
 strong_alias (__pthread_exit, pthread_exit);
 
-
-FORWARD (pthread_getschedparam,
-	 (pthread_t target_thread, int *policy, struct sched_param *param),
-	 (target_thread, policy, param), 0)
 FORWARD (pthread_setschedparam,
 	 (pthread_t target_thread, int policy,
 	  const struct sched_param *param), (target_thread, policy, param), 0)
diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 0386b755af..7fc066041d 100644
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -48,7 +48,6 @@ static const struct pthread_functions pthread_functions = {
   .ptr_pthread_cond_wait = __pthread_cond_wait,
   .ptr_pthread_cond_timedwait = __pthread_cond_timedwait,
   .ptr___pthread_exit = __pthread_exit,
-  .ptr_pthread_getschedparam = __pthread_getschedparam,
   .ptr_pthread_setschedparam = __pthread_setschedparam,
   .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
   .ptr_pthread_mutex_init = __pthread_mutex_init,
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 6aed953d29..89d90dc49b 100644
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -46,7 +46,6 @@ int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
 int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *,
 			     const struct timespec *);
 void __pthread_exit (void *) __attribute__ ((__noreturn__));
-int __pthread_getschedparam (pthread_t, int *, struct sched_param *);
 int __pthread_setschedparam (pthread_t, int,
 			    const struct sched_param *);
 int _pthread_mutex_destroy (pthread_mutex_t *);
@@ -100,7 +99,6 @@ struct pthread_functions
   int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
 				     const struct timespec *);
   void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
-  int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *);
   int (*ptr_pthread_setschedparam) (pthread_t, int,
 				    const struct sched_param *);
   int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index c4f3eb1246..241976e8ef 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -68,7 +68,6 @@ GLIBC_2.12 pthread_exit F
 GLIBC_2.12 pthread_getattr_np F
 GLIBC_2.12 pthread_getconcurrency F
 GLIBC_2.12 pthread_getcpuclockid F
-GLIBC_2.12 pthread_getschedparam F
 GLIBC_2.12 pthread_getspecific F
 GLIBC_2.12 pthread_join F
 GLIBC_2.12 pthread_key_create F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 300ef26a9f..8f2d287d56 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -87,7 +87,6 @@ GLIBC_2.38 pthread_exit F
 GLIBC_2.38 pthread_getattr_np F
 GLIBC_2.38 pthread_getconcurrency F
 GLIBC_2.38 pthread_getcpuclockid F
-GLIBC_2.38 pthread_getschedparam F
 GLIBC_2.38 pthread_getspecific F
 GLIBC_2.38 pthread_hurd_cond_timedwait_np F
 GLIBC_2.38 pthread_hurd_cond_wait_np F