From 1dc0bc8f07483e3faef245c343b773137c8d2c4f Mon Sep 17 00:00:00 2001 From: Guy-Fleury Iteriteka Date: Sun, 16 Jul 2023 10:44:14 +0200 Subject: [PATCH] htl: move pthread_attr_setdetachstate into libc Signed-off-by: Guy-Fleury Iteriteka Message-Id: <20230716084414.107245-11-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 - sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 - 7 files changed, 4 insertions(+), 11 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 54ec1da..b32ad83 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 c656838..7100517 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 e1511a8..cc8147d 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 0b06ef6..170e093 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 c665e4c..f116434 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 3ca0c5d..fa90cc6 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 diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 11ca2fc..80615d1 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -46,7 +46,6 @@ GLIBC_2.38 pthread_attr_getstack F GLIBC_2.38 pthread_attr_getstackaddr F GLIBC_2.38 pthread_attr_getstacksize F GLIBC_2.38 pthread_attr_init F -GLIBC_2.38 pthread_attr_setdetachstate F GLIBC_2.38 pthread_attr_setguardsize F GLIBC_2.38 pthread_attr_setschedparam F GLIBC_2.38 pthread_attr_setscope F -- 2.7.4