diff mbox series

[10/10] htl: move pthread_attr_setdetachstate into libc

Message ID 20230716084414.107245-11-gfleury@disroot.org
State New
Headers show
Series htl: move some forward symbol into libc | expand

Commit Message

Guy-Fleury Iteriteka July 16, 2023, 8:44 a.m. UTC 
Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
---
 htl/Makefile                              | 5 +++--
 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 -
 6 files changed, 4 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/htl/Makefile b/htl/Makefile
index 54ec1da0..b32ad830 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -28,7 +28,7 @@  libpthread-routines := pt-attr pt-attr-destroy                   	    \
 	pt-attr-getguardsize                     			    \
 	pt-attr-getscope	                                            \
 	pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize	    \
-	pt-attr-init pt-attr-setdetachstate pt-attr-setguardsize	    \
+	pt-attr-init pt-attr-setguardsize                       	    \
 	pt-attr-setschedparam			                            \
 	pt-attr-setscope pt-attr-setstack	                            \
 	pt-attr-setstackaddr pt-attr-setstacksize			    \
@@ -166,7 +166,8 @@  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-getdetachstate
+	pt-attr-setinheritsched pt-attr-getschedpolicy pt-attr-setschedpolicy pt-attr-getdetachstate        \
+	pt-attr-setdetachstate
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index c6568384..71005175 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -69,7 +69,7 @@  libpthread {
     pthread_attr_destroy;
     pthread_attr_getguardsize;
     pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr;
-    pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setdetachstate;
+    pthread_attr_getstacksize; pthread_attr_init;
     pthread_attr_setguardsize;
     pthread_attr_setschedparam;
     pthread_attr_setscope; pthread_attr_setstack; pthread_attr_setstackaddr;
diff --git a/htl/forward.c b/htl/forward.c
index e1511a8c..cc8147d6 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_setdetachstate, (pthread_attr_t *attr, int detachstate),
-	 (attr, detachstate), 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 0b06ef6c..170e0938 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_setdetachstate = __pthread_attr_setdetachstate,
   .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
   .ptr_pthread_attr_getscope = __pthread_attr_getscope,
   .ptr_pthread_attr_setscope = __pthread_attr_setscope,
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index c665e4cb..f116434a 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_setdetachstate (pthread_attr_t *, int);
 int __pthread_attr_setschedparam (pthread_attr_t *,
 				 const struct sched_param *);
 int __pthread_attr_getscope (const pthread_attr_t *, int *);
@@ -67,7 +66,6 @@  struct pthread_functions
 {
   int (*ptr_pthread_attr_destroy) (pthread_attr_t *);
   int (*ptr_pthread_attr_init) (pthread_attr_t *);
-  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_getscope) (const pthread_attr_t *, int *);
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 3ca0c5d5..fa90cc65 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -29,7 +29,6 @@  GLIBC_2.12 pthread_attr_getstack F
 GLIBC_2.12 pthread_attr_getstackaddr F
 GLIBC_2.12 pthread_attr_getstacksize F
 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_setscope F