[hurd, commited 08/10] htl: move pthread_attr_setschedpolicy into libc

[Samuel Thibault]

From: Guy-Fleury Iteriteka via Libc-alpha <libc-alpha@sourceware.org>

Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
Message-Id: <20230716084414.107245-9-gfleury@disroot.org>
---
 htl/Makefile                                | 4 ++--
 htl/Versions                                | 2 +-
 htl/forward.c                               | 3 ---
 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, 3 insertions(+), 11 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index ecdc977e11..b8809fe804 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -30,7 +30,7 @@ libpthread-routines := pt-attr pt-attr-destroy 
pt-attr-getdetachstate     \
        pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize          \
        pt-attr-init pt-attr-setdetachstate pt-attr-setguardsize            \
        pt-attr-setschedparam                                               \
-       pt-attr-setschedpolicy pt-attr-setscope pt-attr-setstack            \
+       pt-attr-setscope pt-attr-setstack                                   \
        pt-attr-setstackaddr pt-attr-setstacksize                           \
                                                                            \
        pt-barrier-destroy pt-barrier-init pt-barrier-wait                  \
@@ -166,7 +166,7 @@ distribute :=
 
 routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads 
pt-pthread_self pt-self pt-equal \
        pt-getschedparam pt-setschedparam pt-attr-getschedparam 
pt-attr-getinheritsched                     \
-       pt-attr-setinheritsched pt-attr-getschedpolicy
+       pt-attr-setinheritsched pt-attr-getschedpolicy pt-attr-setschedpolicy
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index ad493142cb..846cc4f89e 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -71,7 +71,7 @@ libpthread {
     pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr;
     pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setdetachstate;
     pthread_attr_setguardsize;
-    pthread_attr_setschedparam; pthread_attr_setschedpolicy;
+    pthread_attr_setschedparam;
     pthread_attr_setscope; pthread_attr_setstack; pthread_attr_setstackaddr;
     pthread_attr_setstacksize;
 
diff --git a/htl/forward.c b/htl/forward.c
index 76a420acd4..f3f2911ff3 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -67,9 +67,6 @@ FORWARD (pthread_attr_setschedparam,
         (pthread_attr_t *attr, const struct sched_param *param),
         (attr, param), 0)
 
-FORWARD (pthread_attr_setschedpolicy, (pthread_attr_t *attr, int policy),
-        (attr, policy), 0)
-
 FORWARD (pthread_attr_getscope,
         (const pthread_attr_t *attr, int *scope), (attr, scope), 0)
 FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),
diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 51a68f419a..d6879e005f 100644
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -32,7 +32,6 @@ static const struct pthread_functions pthread_functions = {
   .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate,
   .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate,
   .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
-  .ptr_pthread_attr_setschedpolicy = __pthread_attr_setschedpolicy,
   .ptr_pthread_attr_getscope = __pthread_attr_getscope,
   .ptr_pthread_attr_setscope = __pthread_attr_setscope,
   .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index f08f4750a2..68c16476e3 100644
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -27,7 +27,6 @@ int __pthread_attr_getdetachstate (const pthread_attr_t *, 
int *);
 int __pthread_attr_setdetachstate (pthread_attr_t *, int);
 int __pthread_attr_setschedparam (pthread_attr_t *,
                                 const struct sched_param *);
-int __pthread_attr_setschedpolicy (pthread_attr_t *, int);
 int __pthread_attr_getscope (const pthread_attr_t *, int *);
 int __pthread_attr_setscope (pthread_attr_t *, int);
 int __pthread_condattr_destroy (pthread_condattr_t *);
@@ -73,7 +72,6 @@ struct pthread_functions
   int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int);
   int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *,
                                         const struct sched_param *);
-  int (*ptr_pthread_attr_setschedpolicy) (pthread_attr_t *, int);
   int (*ptr_pthread_attr_getscope) (const pthread_attr_t *, int *);
   int (*ptr_pthread_attr_setscope) (pthread_attr_t *, int);
   int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist 
b/sysdeps/mach/hurd/i386/libpthread.abilist
index 12ae22bad6..7f3cae62e1 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -33,7 +33,6 @@ GLIBC_2.12 pthread_attr_init F
 GLIBC_2.12 pthread_attr_setdetachstate F
 GLIBC_2.12 pthread_attr_setguardsize 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
 GLIBC_2.12 pthread_attr_setstackaddr F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist 
b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 470a1625c9..2c0f0b395f 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -50,7 +50,6 @@ GLIBC_2.38 pthread_attr_init F
 GLIBC_2.38 pthread_attr_setdetachstate F
 GLIBC_2.38 pthread_attr_setguardsize F
 GLIBC_2.38 pthread_attr_setschedparam F
-GLIBC_2.38 pthread_attr_setschedpolicy F
 GLIBC_2.38 pthread_attr_setscope F
 GLIBC_2.38 pthread_attr_setstack F
 GLIBC_2.38 pthread_attr_setstackaddr F
-- 
2.40.1