htl: move pthread_attr_getinheritsched into libc

Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
Message-Id: <20230716084414.107245-6-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 9e43e571b7b395b30cc725ff73158815d8940063..7d705835de52459f4ad169961f3e3fd6268d80d2 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -25,7 +25,7 @@ SYSDEPS := lockfile
 LCLHDRS :=
 
 libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate      \
-       pt-attr-getguardsize pt-attr-getinheritsched                        \
+       pt-attr-getguardsize                                                \
        pt-attr-getschedpolicy pt-attr-getscope                             \
        pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize          \
        pt-attr-init pt-attr-setdetachstate pt-attr-setguardsize            \
@@ -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-attr-getschedparam
+       pt-getschedparam pt-setschedparam pt-attr-getschedparam pt-attr-getinheritsched
 shared-only-routines = forward
 
 extra-libs := libpthread

diff --git a/htl/Versions b/htl/Versions
index b61fc3f5dea3a5b2a515cd0239210b051ea71490..cd1ab1597cc8e8ea0cd7f3865e19d01a4db89e43 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -67,7 +67,7 @@ libpthread {
     pthread_atfork;
 
     pthread_attr_destroy; pthread_attr_getdetachstate;
-    pthread_attr_getguardsize; pthread_attr_getinheritsched;
+    pthread_attr_getguardsize;
     pthread_attr_getschedpolicy;
     pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr;
     pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setdetachstate;

diff --git a/htl/forward.c b/htl/forward.c
index 63b5f5227598701b1bcf84e3d350992dd93093f3..38b2fcc9961b95d9b95725b31cdeb46e8f694f96 100644 (file)
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -63,8 +63,6 @@ FORWARD (pthread_attr_getdetachstate,
 FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate),
         (attr, detachstate), 0)
 
-FORWARD (pthread_attr_getinheritsched,
-        (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0)
 FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit),
         (attr, inherit), 0)
 

diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 427b3124e6260aeb78b5ee1d526dfc87b5476852..a036aed89439599e6c454a59f72f3f533990497b 100644 (file)
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -31,7 +31,6 @@ static const struct pthread_functions pthread_functions = {
   .ptr_pthread_attr_init = __pthread_attr_init,
   .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate,
   .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate,
-  .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched,
   .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched,
   .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
   .ptr_pthread_attr_getschedpolicy = __pthread_attr_getschedpolicy,

diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index d1cd7a48fa5e723480023d91ea3028c570214c0b..621b97cf051025e2837fea57188b7a84dad7a7a8 100644 (file)
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -25,7 +25,6 @@ int __pthread_attr_destroy (pthread_attr_t *);
 int __pthread_attr_init (pthread_attr_t *);
 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_setschedparam (pthread_attr_t *,
                                 const struct sched_param *);
@@ -74,7 +73,6 @@ struct pthread_functions
   int (*ptr_pthread_attr_init) (pthread_attr_t *);
   int (*ptr_pthread_attr_getdetachstate) (const pthread_attr_t *, int *);
   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_setschedparam) (pthread_attr_t *,
                                         const struct sched_param *);

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 61fa56d08cb98d1de3286382b89e335b81a1195e..d542029ac482e44f850b5d042c897681d8f96277 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -25,7 +25,6 @@ GLIBC_2.12 pthread_atfork F
 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_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 b7ad05e906cc6bd7f8cfa7f72e374ede6f7a89b3..88e3b2de144832763d6108cfb55ffbc843aab8fe 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -42,7 +42,6 @@ GLIBC_2.38 mtx_unlock F
 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_getschedpolicy F
 GLIBC_2.38 pthread_attr_getscope F
 GLIBC_2.38 pthread_attr_getstack F