htl: move pthread_attr_setscope into libc.

Signed-off-by: gfleury <gfleury@disroot.org>

9 files changed, 8 insertions, 12 deletions

diff --git a/htl/Makefile b/htl/Makefile
index d76cba8..eae1c70 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -28,7 +28,6 @@ libpthread-routines := \
   pt-attr-init \
   pt-attr-setguardsize \
   pt-attr-setschedparam \
-  pt-attr-setscope \
   pt-barrier-destroy \
   pt-barrier-init \
   pt-barrier-wait \
@@ -203,6 +202,7 @@ routines := \
   pt-attr-setdetachstate \
   pt-attr-setinheritsched \
   pt-attr-setschedpolicy \
+  pt-attr-setscope \
   pt-attr-setstack \
   pt-attr-setstackaddr \
   pt-attr-setstacksize \
diff --git a/htl/Versions b/htl/Versions
index db8a2de..01f9f27 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -22,6 +22,7 @@ libc {
     pthread_attr_setstacksize;
     pthread_attr_setstackaddr;
     pthread_attr_setstack;
+    pthread_attr_setscope;
   }
 
   GLIBC_2.21 {
@@ -107,7 +108,6 @@ libpthread {
     pthread_attr_init;
     pthread_attr_setguardsize;
     pthread_attr_setschedparam;
-    pthread_attr_setscope;
 
     pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait;
     pthread_barrierattr_destroy; pthread_barrierattr_getpshared;
diff --git a/htl/forward.c b/htl/forward.c
index 6644d67..105b46c 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -59,10 +59,6 @@ FORWARD (pthread_attr_setschedparam,
 	 (pthread_attr_t *attr, const struct sched_param *param),
 	 (attr, param), 0)
 
-FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),
-	 (attr, scope), 0)
-
-
 FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
 FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
 
diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 0d20f39..80afc5e 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_init = __pthread_attr_init,
   .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
-  .ptr_pthread_attr_setscope = __pthread_attr_setscope,
   .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
   .ptr_pthread_condattr_init = __pthread_condattr_init,
   .ptr_pthread_cond_broadcast = __pthread_cond_broadcast,
diff --git a/sysdeps/htl/pt-attr-setscope.c b/sysdeps/htl/pt-attr-setscope.c
index 9d5617f..5a932ad 100644
--- a/sysdeps/htl/pt-attr-setscope.c
+++ b/sysdeps/htl/pt-attr-setscope.c
@@ -17,6 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
+#include <shlib-compat.h>
 #include <pt-internal.h>
 
 int
@@ -37,5 +38,8 @@ __pthread_attr_setscope (pthread_attr_t *attr, int contentionscope)
       return EINVAL;
     }
 }
+versioned_symbol (libc, __pthread_attr_setscope, pthread_attr_setscope, GLIBC_2_21);
 
-weak_alias (__pthread_attr_setscope, pthread_attr_setscope);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
+compat_symbol (libc, __pthread_attr_setscope, pthread_attr_setscope, GLIBC_2_12);
+#endif
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 2a36f20..1c691db 100644
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -24,7 +24,6 @@
 int __pthread_attr_init (pthread_attr_t *);
 int __pthread_attr_setschedparam (pthread_attr_t *,
 				 const struct sched_param *);
-int __pthread_attr_setscope (pthread_attr_t *, int);
 int __pthread_condattr_destroy (pthread_condattr_t *);
 int __pthread_condattr_init (pthread_condattr_t *);
 int __pthread_cond_broadcast (pthread_cond_t *);
@@ -65,7 +64,6 @@ struct pthread_functions
   int (*ptr_pthread_attr_init) (pthread_attr_t *);
   int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *,
 					 const struct sched_param *);
-  int (*ptr_pthread_attr_setscope) (pthread_attr_t *, int);
   int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
   int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
   int (*ptr_pthread_cond_broadcast) (pthread_cond_t *);
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index dabb135..1c3d338 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -42,6 +42,7 @@ GLIBC_2.12 pthread_attr_getstacksize F
 GLIBC_2.12 pthread_attr_setdetachstate F
 GLIBC_2.12 pthread_attr_setinheritsched 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
 GLIBC_2.12 pthread_attr_setstacksize F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 61c6d86..83e3a06 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_init F
 GLIBC_2.12 pthread_attr_setguardsize F
 GLIBC_2.12 pthread_attr_setschedparam F
-GLIBC_2.12 pthread_attr_setscope F
 GLIBC_2.12 pthread_barrier_destroy F
 GLIBC_2.12 pthread_barrier_init F
 GLIBC_2.12 pthread_barrier_wait F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 2f57b85..b4f54f5 100644
--- 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_init F
 GLIBC_2.38 pthread_attr_setguardsize F
 GLIBC_2.38 pthread_attr_setschedparam F
-GLIBC_2.38 pthread_attr_setscope F
 GLIBC_2.38 pthread_barrier_destroy F
 GLIBC_2.38 pthread_barrier_init F
 GLIBC_2.38 pthread_barrier_wait F