[glibc] htl: move pthread_attr_getschedparam into libc

[glibc] htl: move pthread_attr_getschedparam into libc

[Samuel Thibault]

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

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

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

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

diff --git a/htl/Makefile b/htl/Makefile
index 228c689593..9e43e571b7 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -26,7 +26,7 @@ LCLHDRS :=
 
 libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate	    \
 	pt-attr-getguardsize pt-attr-getinheritsched			    \
-	pt-attr-getschedparam pt-attr-getschedpolicy pt-attr-getscope	    \
+	pt-attr-getschedpolicy pt-attr-getscope	                            \
 	pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize	    \
 	pt-attr-init pt-attr-setdetachstate pt-attr-setguardsize	    \
 	pt-attr-setinheritsched pt-attr-setschedparam			    \
@@ -165,7 +165,7 @@ headers :=				\
 distribute :=
 
 routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal \
-	pt-getschedparam pt-setschedparam
+	pt-getschedparam pt-setschedparam pt-attr-getschedparam
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index 89d9d347a5..b61fc3f5de 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -68,7 +68,7 @@ libpthread {
 
     pthread_attr_destroy; pthread_attr_getdetachstate;
     pthread_attr_getguardsize; pthread_attr_getinheritsched;
-    pthread_attr_getschedparam; pthread_attr_getschedpolicy;
+    pthread_attr_getschedpolicy;
     pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr;
     pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setdetachstate;
     pthread_attr_setguardsize; pthread_attr_setinheritsched;
diff --git a/htl/forward.c b/htl/forward.c
index 5a22c07d08..63b5f52275 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -68,9 +68,6 @@ FORWARD (pthread_attr_getinheritsched,
 FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit),
 	 (attr, inherit), 0)
 
-FORWARD (pthread_attr_getschedparam,
-	 (const pthread_attr_t *attr, struct sched_param *param),
-	 (attr, param), 0)
 FORWARD (pthread_attr_setschedparam,
 	 (pthread_attr_t *attr, const struct sched_param *param),
 	 (attr, param), 0)
diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index fae5de4a82..427b3124e6 100644
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -33,7 +33,6 @@ static const struct pthread_functions pthread_functions = {
   .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate,
   .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched,
   .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched,
-  .ptr_pthread_attr_getschedparam = __pthread_attr_getschedparam,
   .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
   .ptr_pthread_attr_getschedpolicy = __pthread_attr_getschedpolicy,
   .ptr_pthread_attr_setschedpolicy = __pthread_attr_setschedpolicy,
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 76bf143234..d1cd7a48fa 100644
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -27,8 +27,6 @@ int __pthread_attr_getdetachstate (const pthread_attr_t *, int *);
 int __pthread_attr_setdetachstate (pthread_attr_t *, int);
 int __pthread_attr_getinheritsched (const pthread_attr_t *, int *);
 int __pthread_attr_setinheritsched (pthread_attr_t *, int);
-int __pthread_attr_getschedparam (const pthread_attr_t *,
-				 struct sched_param *);
 int __pthread_attr_setschedparam (pthread_attr_t *,
 				 const struct sched_param *);
 int __pthread_attr_getschedpolicy (const pthread_attr_t *, int *);
@@ -78,8 +76,6 @@ struct pthread_functions
   int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int);
   int (*ptr_pthread_attr_getinheritsched) (const pthread_attr_t *, int *);
   int (*ptr_pthread_attr_setinheritsched) (pthread_attr_t *, int);
-  int (*ptr_pthread_attr_getschedparam) (const pthread_attr_t *,
-					 struct sched_param *);
   int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *,
 					 const struct sched_param *);
   int (*ptr_pthread_attr_getschedpolicy) (const pthread_attr_t *, int *);
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 421d19a3ec..61fa56d08c 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -26,7 +26,6 @@ GLIBC_2.12 pthread_attr_destroy F
 GLIBC_2.12 pthread_attr_getdetachstate F
 GLIBC_2.12 pthread_attr_getguardsize F
 GLIBC_2.12 pthread_attr_getinheritsched F
-GLIBC_2.12 pthread_attr_getschedparam F
 GLIBC_2.12 pthread_attr_getschedpolicy F
 GLIBC_2.12 pthread_attr_getscope F
 GLIBC_2.12 pthread_attr_getstack F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index c8097e5819..b7ad05e906 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -43,7 +43,6 @@ GLIBC_2.38 pthread_attr_destroy F
 GLIBC_2.38 pthread_attr_getdetachstate F
 GLIBC_2.38 pthread_attr_getguardsize F
 GLIBC_2.38 pthread_attr_getinheritsched F
-GLIBC_2.38 pthread_attr_getschedparam F
 GLIBC_2.38 pthread_attr_getschedpolicy F
 GLIBC_2.38 pthread_attr_getscope F
 GLIBC_2.38 pthread_attr_getstack F