htl: move pthread_attr_setscope into libc.

Signed-off-by: gfleury <gfleury@disroot.org>
This commit is contained in:
gfleury 2024-11-18 13:21:42 +02:00 committed by Samuel Thibault
parent 4a8b7d7e62
commit 32aa498ceb
9 changed files with 8 additions and 12 deletions

View File

@ -28,7 +28,6 @@ libpthread-routines := \
pt-attr-init \ pt-attr-init \
pt-attr-setguardsize \ pt-attr-setguardsize \
pt-attr-setschedparam \ pt-attr-setschedparam \
pt-attr-setscope \
pt-barrier-destroy \ pt-barrier-destroy \
pt-barrier-init \ pt-barrier-init \
pt-barrier-wait \ pt-barrier-wait \
@ -203,6 +202,7 @@ routines := \
pt-attr-setdetachstate \ pt-attr-setdetachstate \
pt-attr-setinheritsched \ pt-attr-setinheritsched \
pt-attr-setschedpolicy \ pt-attr-setschedpolicy \
pt-attr-setscope \
pt-attr-setstack \ pt-attr-setstack \
pt-attr-setstackaddr \ pt-attr-setstackaddr \
pt-attr-setstacksize \ pt-attr-setstacksize \

View File

@ -22,6 +22,7 @@ libc {
pthread_attr_setstacksize; pthread_attr_setstacksize;
pthread_attr_setstackaddr; pthread_attr_setstackaddr;
pthread_attr_setstack; pthread_attr_setstack;
pthread_attr_setscope;
} }
GLIBC_2.21 { GLIBC_2.21 {
@ -107,7 +108,6 @@ libpthread {
pthread_attr_init; pthread_attr_init;
pthread_attr_setguardsize; pthread_attr_setguardsize;
pthread_attr_setschedparam; pthread_attr_setschedparam;
pthread_attr_setscope;
pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait; pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait;
pthread_barrierattr_destroy; pthread_barrierattr_getpshared; pthread_barrierattr_destroy; pthread_barrierattr_getpshared;

View File

@ -59,10 +59,6 @@ FORWARD (pthread_attr_setschedparam,
(pthread_attr_t *attr, const struct sched_param *param), (pthread_attr_t *attr, const struct sched_param *param),
(attr, param), 0) (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_destroy, (pthread_condattr_t *attr), (attr), 0)
FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0) FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)

View File

@ -29,7 +29,6 @@
static const struct pthread_functions pthread_functions = { static const struct pthread_functions pthread_functions = {
.ptr_pthread_attr_init = __pthread_attr_init, .ptr_pthread_attr_init = __pthread_attr_init,
.ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam, .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
.ptr_pthread_attr_setscope = __pthread_attr_setscope,
.ptr_pthread_condattr_destroy = __pthread_condattr_destroy, .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
.ptr_pthread_condattr_init = __pthread_condattr_init, .ptr_pthread_condattr_init = __pthread_condattr_init,
.ptr_pthread_cond_broadcast = __pthread_cond_broadcast, .ptr_pthread_cond_broadcast = __pthread_cond_broadcast,

View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <pthread.h> #include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h> #include <pt-internal.h>
int int
@ -37,5 +38,8 @@ __pthread_attr_setscope (pthread_attr_t *attr, int contentionscope)
return EINVAL; 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

View File

@ -24,7 +24,6 @@
int __pthread_attr_init (pthread_attr_t *); int __pthread_attr_init (pthread_attr_t *);
int __pthread_attr_setschedparam (pthread_attr_t *, int __pthread_attr_setschedparam (pthread_attr_t *,
const struct sched_param *); const struct sched_param *);
int __pthread_attr_setscope (pthread_attr_t *, int);
int __pthread_condattr_destroy (pthread_condattr_t *); int __pthread_condattr_destroy (pthread_condattr_t *);
int __pthread_condattr_init (pthread_condattr_t *); int __pthread_condattr_init (pthread_condattr_t *);
int __pthread_cond_broadcast (pthread_cond_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_init) (pthread_attr_t *);
int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *, int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *,
const struct sched_param *); 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_destroy) (pthread_condattr_t *);
int (*ptr_pthread_condattr_init) (pthread_condattr_t *); int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
int (*ptr_pthread_cond_broadcast) (pthread_cond_t *); int (*ptr_pthread_cond_broadcast) (pthread_cond_t *);

View File

@ -42,6 +42,7 @@ GLIBC_2.12 pthread_attr_getstacksize F
GLIBC_2.12 pthread_attr_setdetachstate F GLIBC_2.12 pthread_attr_setdetachstate F
GLIBC_2.12 pthread_attr_setinheritsched F GLIBC_2.12 pthread_attr_setinheritsched F
GLIBC_2.12 pthread_attr_setschedpolicy 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_setstack F
GLIBC_2.12 pthread_attr_setstackaddr F GLIBC_2.12 pthread_attr_setstackaddr F
GLIBC_2.12 pthread_attr_setstacksize F GLIBC_2.12 pthread_attr_setstacksize F

View File

@ -25,7 +25,6 @@ GLIBC_2.12 pthread_atfork F
GLIBC_2.12 pthread_attr_init F GLIBC_2.12 pthread_attr_init F
GLIBC_2.12 pthread_attr_setguardsize F GLIBC_2.12 pthread_attr_setguardsize F
GLIBC_2.12 pthread_attr_setschedparam 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_destroy F
GLIBC_2.12 pthread_barrier_init F GLIBC_2.12 pthread_barrier_init F
GLIBC_2.12 pthread_barrier_wait F GLIBC_2.12 pthread_barrier_wait F

View File

@ -42,7 +42,6 @@ GLIBC_2.38 mtx_unlock F
GLIBC_2.38 pthread_attr_init F GLIBC_2.38 pthread_attr_init F
GLIBC_2.38 pthread_attr_setguardsize F GLIBC_2.38 pthread_attr_setguardsize F
GLIBC_2.38 pthread_attr_setschedparam 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_destroy F
GLIBC_2.38 pthread_barrier_init F GLIBC_2.38 pthread_barrier_init F
GLIBC_2.38 pthread_barrier_wait F GLIBC_2.38 pthread_barrier_wait F