[hurd, commited 09/10] htl: move pthread_attr_getdetachstate 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-10-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 b8809fe804..54ec1da039 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -24,7 +24,7 @@ SYSDEPS := lockfile
 
 LCLHDRS :=
 
-libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate      \
+libpthread-routines := pt-attr pt-attr-destroy                             \
        pt-attr-getguardsize                                                \
        pt-attr-getscope                                                    \
        pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize          \
@@ -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-setschedpolicy
+       pt-attr-setinheritsched pt-attr-getschedpolicy pt-attr-setschedpolicy 
pt-attr-getdetachstate
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index 846cc4f89e..c656838409 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -66,7 +66,7 @@ libpthread {
 
     pthread_atfork;
 
-    pthread_attr_destroy; pthread_attr_getdetachstate;
+    pthread_attr_destroy;
     pthread_attr_getguardsize;
     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 f3f2911ff3..e1511a8c59 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -57,9 +57,6 @@ FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), 
(attr), 0)
 
 FORWARD (pthread_attr_init, (pthread_attr_t *attr), (attr), 0)
 
-FORWARD (pthread_attr_getdetachstate,
-        (const pthread_attr_t *attr, int *detachstate), (attr, detachstate),
-        0)
 FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate),
         (attr, detachstate), 0)
 
diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index d6879e005f..0b06ef6c75 100644
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -29,7 +29,6 @@
 static const struct pthread_functions pthread_functions = {
   .ptr_pthread_attr_destroy = __pthread_attr_destroy,
   .ptr_pthread_attr_init = __pthread_attr_init,
-  .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate,
   .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate,
   .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
   .ptr_pthread_attr_getscope = __pthread_attr_getscope,
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 68c16476e3..c665e4cb0b 100644
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -23,7 +23,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_setschedparam (pthread_attr_t *,
                                 const struct sched_param *);
@@ -68,7 +67,6 @@ struct pthread_functions
 {
   int (*ptr_pthread_attr_destroy) (pthread_attr_t *);
   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_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 7f3cae62e1..3ca0c5d52b 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -23,7 +23,6 @@ GLIBC_2.12 ftrylockfile F
 GLIBC_2.12 funlockfile F
 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_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 2c0f0b395f..11ca2fc288 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -40,7 +40,6 @@ GLIBC_2.38 mtx_timedlock F
 GLIBC_2.38 mtx_trylock F
 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_getscope F
 GLIBC_2.38 pthread_attr_getstack F
-- 
2.40.1