From 0f3a39072b5893bef6d06e15f98e2a06a11df856 Mon Sep 17 00:00:00 2001 From: Guy-Fleury Iteriteka Date: Sun, 16 Jul 2023 10:44:11 +0200 Subject: htl: move pthread_attr_getschedpolicy into libc Signed-off-by: Guy-Fleury Iteriteka Message-Id: <20230716084414.107245-8-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 - sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 - 7 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 0318d81166..ecdc977e11 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 854ccceeff..ad493142cb 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 adc64e87ad..76a420acd4 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 01da6dae01..51a68f419a 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 4054d06918..f08f4750a2 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 dae5c433d5..12ae22bad6 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 diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index c227e9569e..470a1625c9 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_destroy F GLIBC_2.38 pthread_attr_getdetachstate F GLIBC_2.38 pthread_attr_getguardsize F -GLIBC_2.38 pthread_attr_getschedpolicy F GLIBC_2.38 pthread_attr_getscope F GLIBC_2.38 pthread_attr_getstack F GLIBC_2.38 pthread_attr_getstackaddr F -- cgit 1.4.1