htl move pthread_attr_getscope into libc.

Signed-off-by: gfleury <gfleury@disroot.org>
This commit is contained in:
gfleury 2024-11-18 13:21:36 +02:00 committed by Samuel Thibault
parent 6caf24c972
commit 4bcda927fe
9 changed files with 9 additions and 10 deletions

View File

@ -25,7 +25,6 @@ SYSDEPS := lockfile
LCLHDRS :=
libpthread-routines := \
pt-attr-getscope \
pt-attr-getstack \
pt-attr-getstackaddr \
pt-attr-getstacksize \
@ -203,6 +202,7 @@ routines := \
pt-attr-getinheritsched \
pt-attr-getschedparam \
pt-attr-getschedpolicy \
pt-attr-getscope \
pt-attr-setdetachstate \
pt-attr-setinheritsched \
pt-attr-setschedpolicy \

View File

@ -15,6 +15,7 @@ libc {
pthread_setschedparam;
pthread_attr_destroy;
pthread_attr_getguardsize;
pthread_attr_getscope;
}
GLIBC_2.21 {
@ -85,7 +86,7 @@ libpthread {
pthread_atfork;
pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr;
pthread_attr_getstack; pthread_attr_getstackaddr;
pthread_attr_getstacksize; pthread_attr_init;
pthread_attr_setguardsize;
pthread_attr_setschedparam;

View File

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

View File

@ -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_getscope = __pthread_attr_getscope,
.ptr_pthread_attr_setscope = __pthread_attr_setscope,
.ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
.ptr_pthread_condattr_init = __pthread_condattr_init,

View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
int
@ -25,5 +26,8 @@ __pthread_attr_getscope (const pthread_attr_t *attr, int *contentionscope)
*contentionscope = attr->__contentionscope;
return 0;
}
versioned_symbol (libc, __pthread_attr_getscope, pthread_attr_getscope, GLIBC_2_21);
weak_alias (__pthread_attr_getscope, pthread_attr_getscope);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_attr_getscope, pthread_attr_getscope, GLIBC_2_12);
#endif

View File

@ -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_getscope (const pthread_attr_t *, int *);
int __pthread_attr_setscope (pthread_attr_t *, int);
int __pthread_condattr_destroy (pthread_condattr_t *);
int __pthread_condattr_init (pthread_condattr_t *);
@ -66,7 +65,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_getscope) (const pthread_attr_t *, int *);
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 *);

View File

@ -35,6 +35,7 @@ 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_setdetachstate F
GLIBC_2.12 pthread_attr_setinheritsched F
GLIBC_2.12 pthread_attr_setschedpolicy F

View File

@ -22,7 +22,6 @@ GLIBC_2.12 flockfile F
GLIBC_2.12 ftrylockfile F
GLIBC_2.12 funlockfile F
GLIBC_2.12 pthread_atfork F
GLIBC_2.12 pthread_attr_getscope F
GLIBC_2.12 pthread_attr_getstack F
GLIBC_2.12 pthread_attr_getstackaddr F
GLIBC_2.12 pthread_attr_getstacksize F

View File

@ -39,7 +39,6 @@ GLIBC_2.38 mtx_lock F
GLIBC_2.38 mtx_timedlock F
GLIBC_2.38 mtx_trylock F
GLIBC_2.38 mtx_unlock F
GLIBC_2.38 pthread_attr_getscope F
GLIBC_2.38 pthread_attr_getstack F
GLIBC_2.38 pthread_attr_getstackaddr F
GLIBC_2.38 pthread_attr_getstacksize F