[PATCH 00/10] htl: move some forward symbol into libc

[PATCH 00/10] htl: move some forward symbol into libc

[Guy-Fleury Iteriteka]

I just follow what have been done in nptl for forward symbol like in dda373b00e812d14ac7e228d117f9047ceee38c9.
i didn't add a new version like i did last time 5476f8cd2e68800a705e80f568599e1a38facd93
 
Guy-Fleury Iteriteka (10):
  htl: move pthread-equal into libc
  htl: move pthread_getschedparam into libc
  htl: move pthread_setschedparam into libc
  htl: move pthread_attr_getschedparam into libc
  htl: move pthread_attr_getguardsize into libc
  htl: move pthread_attr_setinheritsched into libc
  htl: move pthread_attr_getschedpolicy into libc
  htl: move pthread_attr_setschedpolicy into libc
  htl: move pthread_attr_getdetachstate into libc
  htl: move pthread_attr_setdetachstate into libc

 htl/Makefile                              | 20 +++++++-------
 htl/Versions                              | 17 ++++++------
 htl/forward.c                             | 32 -----------------------
 htl/pt-initialize.c                       | 10 -------
 sysdeps/htl/pthread-functions.h           | 24 -----------------
 sysdeps/mach/hurd/i386/libpthread.abilist | 10 -------
 6 files changed, 19 insertions(+), 94 deletions(-)

-- 
2.39.2

[PATCH 01/10] htl: move pthread-equal into libc

[Guy-Fleury Iteriteka]

Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
---
 htl/Makefile                              | 3 +--
 htl/Versions                              | 2 +-
 htl/forward.c                             | 4 ----
 htl/pt-initialize.c                       | 1 -
 sysdeps/htl/pthread-functions.h           | 2 --
 sysdeps/mach/hurd/i386/libpthread.abilist | 1 -
 6 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index 5de036ac..b131aa19 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -46,7 +46,6 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate	    \
 	pt-alloc							    \
 	pt-create							    \
 	pt-getattr							    \
-	pt-equal							    \
 	pt-dealloc							    \
 	pt-detach							    \
 	pt-exit								    \
@@ -165,7 +164,7 @@ headers :=				\
 
 distribute :=
 
-routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self
+routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index 70fa4463..c2be7799 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -89,7 +89,7 @@ libpthread {
     pthread_condattr_getpshared; pthread_condattr_init;
     pthread_condattr_setclock; pthread_condattr_setpshared;
 
-    pthread_create; pthread_detach; pthread_equal; pthread_exit;
+    pthread_create; pthread_detach; pthread_exit;
 
     pthread_getattr_np;
 
diff --git a/htl/forward.c b/htl/forward.c
index 1bee2b02..a8147d36 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -102,10 +102,6 @@ FORWARD (pthread_cond_timedwait,
 	 (pthread_cond_t *cond, pthread_mutex_t *mutex,
 	  const struct timespec *abstime), (cond, mutex, abstime), 0)
 
-FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2),
-	 (thread1, thread2), 1)
-
-
 /* Use an alias to avoid warning, as pthread_exit is declared noreturn.  */
 FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
 		  exit (EXIT_SUCCESS))
diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index aa8561f7..0386b755 100644
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -47,7 +47,6 @@ static const struct pthread_functions pthread_functions = {
   .ptr_pthread_cond_signal = __pthread_cond_signal,
   .ptr_pthread_cond_wait = __pthread_cond_wait,
   .ptr_pthread_cond_timedwait = __pthread_cond_timedwait,
-  .ptr_pthread_equal = __pthread_equal,
   .ptr___pthread_exit = __pthread_exit,
   .ptr_pthread_getschedparam = __pthread_getschedparam,
   .ptr_pthread_setschedparam = __pthread_setschedparam,
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 96728b83..6aed953d 100644
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -45,7 +45,6 @@ int __pthread_cond_signal (pthread_cond_t *);
 int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
 int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *,
 			     const struct timespec *);
-int __pthread_equal (pthread_t, pthread_t);
 void __pthread_exit (void *) __attribute__ ((__noreturn__));
 int __pthread_getschedparam (pthread_t, int *, struct sched_param *);
 int __pthread_setschedparam (pthread_t, int,
@@ -100,7 +99,6 @@ struct pthread_functions
   int (*ptr_pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
   int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
 				     const struct timespec *);
-  int (*ptr_pthread_equal) (pthread_t, pthread_t);
   void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
   int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *);
   int (*ptr_pthread_setschedparam) (pthread_t, int,
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 2ef0f670..c4f3eb12 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -64,7 +64,6 @@ GLIBC_2.12 pthread_condattr_setclock F
 GLIBC_2.12 pthread_condattr_setpshared F
 GLIBC_2.12 pthread_create F
 GLIBC_2.12 pthread_detach F
-GLIBC_2.12 pthread_equal F
 GLIBC_2.12 pthread_exit F
 GLIBC_2.12 pthread_getattr_np F
 GLIBC_2.12 pthread_getconcurrency F
-- 
2.39.2

[PATCH 02/10] htl: move pthread_getschedparam into libc

[Guy-Fleury Iteriteka]

Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
---
 htl/Makefile                              | 5 +++--
 htl/Versions                              | 2 +-
 htl/forward.c                             | 4 ----
 htl/pt-initialize.c                       | 1 -
 sysdeps/htl/pthread-functions.h           | 2 --
 sysdeps/mach/hurd/i386/libpthread.abilist | 1 -
 6 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index b131aa19..9362a583 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -122,7 +122,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate	    \
 	pt-kill								    \
 	pt-getcpuclockid						    \
 									    \
-	pt-getschedparam pt-setschedparam pt-setschedprio		    \
+	pt-setschedparam pt-setschedprio		                    \
 	pt-yield							    \
 									    \
 	sem_close sem-destroy sem-getvalue sem-init sem_open		    \
@@ -164,7 +164,8 @@ headers :=				\
 
 distribute :=
 
-routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal
+routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal \
+	pt-getschedparam
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index c2be7799..f376bf2f 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -94,7 +94,7 @@ libpthread {
     pthread_getattr_np;
 
     pthread_getconcurrency; pthread_getcpuclockid;
-    pthread_getschedparam; pthread_getspecific;
+    pthread_getspecific;
 
     pthread_join;
 
diff --git a/htl/forward.c b/htl/forward.c
index a8147d36..df0d4ecc 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -107,10 +107,6 @@ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
 		  exit (EXIT_SUCCESS))
 strong_alias (__pthread_exit, pthread_exit);
 
-
-FORWARD (pthread_getschedparam,
-	 (pthread_t target_thread, int *policy, struct sched_param *param),
-	 (target_thread, policy, param), 0)
 FORWARD (pthread_setschedparam,
 	 (pthread_t target_thread, int policy,
 	  const struct sched_param *param), (target_thread, policy, param), 0)
diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 0386b755..7fc06604 100644
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -48,7 +48,6 @@ static const struct pthread_functions pthread_functions = {
   .ptr_pthread_cond_wait = __pthread_cond_wait,
   .ptr_pthread_cond_timedwait = __pthread_cond_timedwait,
   .ptr___pthread_exit = __pthread_exit,
-  .ptr_pthread_getschedparam = __pthread_getschedparam,
   .ptr_pthread_setschedparam = __pthread_setschedparam,
   .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
   .ptr_pthread_mutex_init = __pthread_mutex_init,
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 6aed953d..89d90dc4 100644
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -46,7 +46,6 @@ int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
 int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *,
 			     const struct timespec *);
 void __pthread_exit (void *) __attribute__ ((__noreturn__));
-int __pthread_getschedparam (pthread_t, int *, struct sched_param *);
 int __pthread_setschedparam (pthread_t, int,
 			    const struct sched_param *);
 int _pthread_mutex_destroy (pthread_mutex_t *);
@@ -100,7 +99,6 @@ struct pthread_functions
   int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
 				     const struct timespec *);
   void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
-  int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *);
   int (*ptr_pthread_setschedparam) (pthread_t, int,
 				    const struct sched_param *);
   int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index c4f3eb12..241976e8 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -68,7 +68,6 @@ GLIBC_2.12 pthread_exit F
 GLIBC_2.12 pthread_getattr_np F
 GLIBC_2.12 pthread_getconcurrency F
 GLIBC_2.12 pthread_getcpuclockid F
-GLIBC_2.12 pthread_getschedparam F
 GLIBC_2.12 pthread_getspecific F
 GLIBC_2.12 pthread_join F
 GLIBC_2.12 pthread_key_create F
-- 
2.39.2

[PATCH 03/10] htl: move pthread_setschedparam into libc

[Guy-Fleury Iteriteka]

Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
---
 htl/Makefile                              | 4 ++--
 htl/Versions                              | 2 +-
 htl/forward.c                             | 5 -----
 htl/pt-initialize.c                       | 1 -
 sysdeps/htl/pthread-functions.h           | 4 ----
 sysdeps/mach/hurd/i386/libpthread.abilist | 1 -
 6 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index 9362a583..228c6895 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -122,7 +122,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate	    \
 	pt-kill								    \
 	pt-getcpuclockid						    \
 									    \
-	pt-setschedparam pt-setschedprio		                    \
+	pt-setschedprio		                                            \
 	pt-yield							    \
 									    \
 	sem_close sem-destroy sem-getvalue sem-init sem_open		    \
@@ -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-getschedparam pt-setschedparam
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index f376bf2f..89d9d347 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -126,7 +126,7 @@ libpthread {
     pthread_rwlockattr_init; pthread_rwlockattr_setpshared;
 
     pthread_setcancelstate; pthread_setcanceltype;
-    pthread_setconcurrency; pthread_setschedparam;
+    pthread_setconcurrency;
     pthread_setschedprio; pthread_setspecific;
 
     pthread_sigmask;
diff --git a/htl/forward.c b/htl/forward.c
index df0d4ecc..5a22c07d 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -107,11 +107,6 @@ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
 		  exit (EXIT_SUCCESS))
 strong_alias (__pthread_exit, pthread_exit);
 
-FORWARD (pthread_setschedparam,
-	 (pthread_t target_thread, int policy,
-	  const struct sched_param *param), (target_thread, policy, param), 0)
-
-
 FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0)
 
 FORWARD (pthread_mutex_init,
diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 7fc06604..fae5de4a 100644
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -48,7 +48,6 @@ static const struct pthread_functions pthread_functions = {
   .ptr_pthread_cond_wait = __pthread_cond_wait,
   .ptr_pthread_cond_timedwait = __pthread_cond_timedwait,
   .ptr___pthread_exit = __pthread_exit,
-  .ptr_pthread_setschedparam = __pthread_setschedparam,
   .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
   .ptr_pthread_mutex_init = __pthread_mutex_init,
   .ptr_pthread_mutex_lock = __pthread_mutex_lock,
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 89d90dc4..76bf1432 100644
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -46,8 +46,6 @@ int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
 int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *,
 			     const struct timespec *);
 void __pthread_exit (void *) __attribute__ ((__noreturn__));
-int __pthread_setschedparam (pthread_t, int,
-			    const struct sched_param *);
 int _pthread_mutex_destroy (pthread_mutex_t *);
 int _pthread_mutex_init (pthread_mutex_t *,
 			 const pthread_mutexattr_t *);
@@ -99,8 +97,6 @@ struct pthread_functions
   int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
 				     const struct timespec *);
   void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
-  int (*ptr_pthread_setschedparam) (pthread_t, int,
-				    const struct sched_param *);
   int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);
   int (*ptr_pthread_mutex_init) (pthread_mutex_t *,
 				 const pthread_mutexattr_t *);
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 241976e8..421d19a3 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -109,7 +109,6 @@ GLIBC_2.12 pthread_rwlockattr_setpshared F
 GLIBC_2.12 pthread_setcancelstate F
 GLIBC_2.12 pthread_setcanceltype F
 GLIBC_2.12 pthread_setconcurrency F
-GLIBC_2.12 pthread_setschedparam F
 GLIBC_2.12 pthread_setschedprio F
 GLIBC_2.12 pthread_setspecific F
 GLIBC_2.12 pthread_sigmask F
-- 
2.39.2

[PATCH 04/10] htl: move pthread_attr_getschedparam into libc

[Guy-Fleury Iteriteka]

Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
---
 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 -
 6 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index 228c6895..9e43e571 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 89d9d347..b61fc3f5 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 5a22c07d..63b5f522 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 fae5de4a..427b3124 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 76bf1432..d1cd7a48 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 421d19a3..61fa56d0 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
-- 
2.39.2

[PATCH 05/10] htl: move pthread_attr_getguardsize into libc

[Guy-Fleury Iteriteka]

Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
---
 htl/Makefile                              | 4 ++--
 htl/Versions                              | 2 +-
 htl/forward.c                             | 2 --
 htl/pt-initialize.c                       | 1 -
 sysdeps/htl/pthread-functions.h           | 2 --
 sysdeps/mach/hurd/i386/libpthread.abilist | 1 -
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index 9e43e571..7d705835 100644
--- 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 b61fc3f5..cd1ab159 100644
--- 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 63b5f522..38b2fcc9 100644
--- 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 427b3124..a036aed8 100644
--- 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 d1cd7a48..621b97cf 100644
--- 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 61fa56d0..d542029a 100644
--- 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
-- 
2.39.2

[PATCH 06/10] htl: move pthread_attr_setinheritsched into libc

[Guy-Fleury Iteriteka]

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 --git a/htl/Makefile b/htl/Makefile
index 7d705835..0318d811 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -29,7 +29,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate	    \
 	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			    \
+	pt-attr-setschedparam			                            \
 	pt-attr-setschedpolicy pt-attr-setscope pt-attr-setstack	    \
 	pt-attr-setstackaddr pt-attr-setstacksize			    \
 									    \
@@ -165,7 +165,8 @@ 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-attr-getinheritsched
+	pt-getschedparam pt-setschedparam pt-attr-getschedparam pt-attr-getinheritsched                     \
+	pt-attr-setinheritsched
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index cd1ab159..854cccee 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -71,7 +71,7 @@ libpthread {
     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;
+    pthread_attr_setguardsize;
     pthread_attr_setschedparam; pthread_attr_setschedpolicy;
     pthread_attr_setscope; pthread_attr_setstack; pthread_attr_setstackaddr;
     pthread_attr_setstacksize;
diff --git a/htl/forward.c b/htl/forward.c
index 38b2fcc9..adc64e87 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -63,9 +63,6 @@ FORWARD (pthread_attr_getdetachstate,
 FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate),
 	 (attr, detachstate), 0)
 
-FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit),
-	 (attr, inherit), 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 a036aed8..01da6dae 100644
--- 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_setinheritsched = __pthread_attr_setinheritsched,
   .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 621b97cf..4054d069 100644
--- 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_setinheritsched (pthread_attr_t *, int);
 int __pthread_attr_setschedparam (pthread_attr_t *,
 				 const struct sched_param *);
 int __pthread_attr_getschedpolicy (const pthread_attr_t *, int *);
@@ -73,7 +72,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_setinheritsched) (pthread_attr_t *, int);
   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 d542029a..dae5c433 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -33,7 +33,6 @@ 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_setinheritsched F
 GLIBC_2.12 pthread_attr_setschedparam F
 GLIBC_2.12 pthread_attr_setschedpolicy F
 GLIBC_2.12 pthread_attr_setscope F
-- 
2.39.2

[PATCH 07/10] htl: move pthread_attr_getschedpolicy into libc

[Guy-Fleury Iteriteka]

Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
---
 htl/Makefile                              | 4 ++--
 htl/Versions                              | 1 -
 htl/forward.c                             | 2 --
 htl/pt-initialize.c                       | 1 -
 sysdeps/htl/pthread-functions.h           | 2 --
 sysdeps/mach/hurd/i386/libpthread.abilist | 1 -
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index 0318d811..ecdc977e 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-getschedpolicy pt-attr-getscope	                            \
+	pt-attr-getscope	                                            \
 	pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize	    \
 	pt-attr-init pt-attr-setdetachstate pt-attr-setguardsize	    \
 	pt-attr-setschedparam			                            \
@@ -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-setinheritsched pt-attr-getschedpolicy
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index 854cccee..ad493142 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -68,7 +68,6 @@ libpthread {
 
     pthread_attr_destroy; pthread_attr_getdetachstate;
     pthread_attr_getguardsize;
-    pthread_attr_getschedpolicy;
     pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr;
     pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setdetachstate;
     pthread_attr_setguardsize;
diff --git a/htl/forward.c b/htl/forward.c
index adc64e87..76a420ac 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -67,8 +67,6 @@ FORWARD (pthread_attr_setschedparam,
 	 (pthread_attr_t *attr, const struct sched_param *param),
 	 (attr, param), 0)
 
-FORWARD (pthread_attr_getschedpolicy,
-	 (const pthread_attr_t *attr, int *policy), (attr, policy), 0)
 FORWARD (pthread_attr_setschedpolicy, (pthread_attr_t *attr, int policy),
 	 (attr, policy), 0)
 
diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 01da6dae..51a68f41 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_getschedpolicy = __pthread_attr_getschedpolicy,
   .ptr_pthread_attr_setschedpolicy = __pthread_attr_setschedpolicy,
   .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 4054d069..f08f4750 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_getschedpolicy (const pthread_attr_t *, int *);
 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);
@@ -74,7 +73,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_getschedpolicy) (const pthread_attr_t *, int *);
   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);
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index dae5c433..12ae22ba 100644
--- 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_getschedpolicy F
 GLIBC_2.12 pthread_attr_getscope F
 GLIBC_2.12 pthread_attr_getstack F
 GLIBC_2.12 pthread_attr_getstackaddr F
-- 
2.39.2

[PATCH 08/10] htl: move pthread_attr_setschedpolicy into libc

[Guy-Fleury Iteriteka]

Signed-off-by: Guy-Fleury Iteriteka <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 -
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index ecdc977e..b8809fe8 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 ad493142..846cc4f8 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 76a420ac..f3f2911f 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 51a68f41..d6879e00 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 f08f4750..68c16476 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 12ae22ba..7f3cae62 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
-- 
2.39.2

[PATCH 09/10] htl: move pthread_attr_getdetachstate into libc

[Guy-Fleury Iteriteka]

Signed-off-by: Guy-Fleury Iteriteka <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 -
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index b8809fe8..54ec1da0 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 846cc4f8..c6568384 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 f3f2911f..e1511a8c 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 d6879e00..0b06ef6c 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 68c16476..c665e4cb 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 7f3cae62..3ca0c5d5 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
-- 
2.39.2

[PATCH 10/10] htl: move pthread_attr_setdetachstate into libc

[Guy-Fleury Iteriteka]

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 --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
-- 
2.39.2

Re: [PATCH 00/10] htl: move some forward symbol into libc

[Samuel Thibault]

Hello,

Applied, thanks!

For next rounds, please remember to also update 
sysdeps/mach/hurd/x86_64/libpthread.abilist

Samuel

Guy-Fleury Iteriteka via Libc-alpha, le dim. 16 juil. 2023 10:44:04 +0200, a ecrit:
> I just follow what have been done in nptl for forward symbol like in dda373b00e812d14ac7e228d117f9047ceee38c9.
> i didn't add a new version like i did last time 5476f8cd2e68800a705e80f568599e1a38facd93
>  
> Guy-Fleury Iteriteka (10):
>   htl: move pthread-equal into libc
>   htl: move pthread_getschedparam into libc
>   htl: move pthread_setschedparam into libc
>   htl: move pthread_attr_getschedparam into libc
>   htl: move pthread_attr_getguardsize into libc
>   htl: move pthread_attr_setinheritsched into libc
>   htl: move pthread_attr_getschedpolicy into libc
>   htl: move pthread_attr_setschedpolicy into libc
>   htl: move pthread_attr_getdetachstate into libc
>   htl: move pthread_attr_setdetachstate into libc
> 
>  htl/Makefile                              | 20 +++++++-------
>  htl/Versions                              | 17 ++++++------
>  htl/forward.c                             | 32 -----------------------
>  htl/pt-initialize.c                       | 10 -------
>  sysdeps/htl/pthread-functions.h           | 24 -----------------
>  sysdeps/mach/hurd/i386/libpthread.abilist | 10 -------
>  6 files changed, 19 insertions(+), 94 deletions(-)
> 
> -- 
> 2.39.2
>