From ffced383cd7e092a1c6e50ca50f692d2fe2a7dbe Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 28 Aug 2019 12:01:14 +0200 Subject: nptl: Move pthread_attr_setdetachstate implementation into libc Reviewed-by: Adhemerval Zanella --- nptl/Makefile | 4 ++-- nptl/Versions | 1 - nptl/forward.c | 3 --- nptl/nptl-init.c | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) (limited to 'nptl') diff --git a/nptl/Makefile b/nptl/Makefile index 4c7ae6a..823241d3 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -31,7 +31,8 @@ routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \ libc-cleanup libc_pthread_init libc_multiple_threads \ register-atfork pthread_atfork pthread_self thrd_current \ thrd_equal thrd_sleep thrd_yield pthread_equal \ - pthread_attr_destroy pthread_attr_init pthread_attr_getdetachstate + pthread_attr_destroy pthread_attr_init pthread_attr_getdetachstate \ + pthread_attr_setdetachstate shared-only-routines = forward static-only-routines = pthread_atfork @@ -54,7 +55,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \ pthread_getconcurrency pthread_setconcurrency \ pthread_getschedparam pthread_setschedparam \ pthread_setschedprio \ - pthread_attr_setdetachstate \ pthread_attr_getguardsize pthread_attr_setguardsize \ pthread_attr_getschedparam pthread_attr_setschedparam \ pthread_attr_getschedpolicy pthread_attr_setschedpolicy \ diff --git a/nptl/Versions b/nptl/Versions index ae0a4cb..1e055ea 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -49,7 +49,6 @@ libpthread { pthread_getschedparam; pthread_setschedparam; - pthread_attr_setdetachstate; pthread_attr_getschedparam; pthread_attr_setschedparam; pthread_attr_getschedpolicy; pthread_attr_setschedpolicy; pthread_attr_getinheritsched; pthread_attr_setinheritsched; diff --git a/nptl/forward.c b/nptl/forward.c index 96454bc..163a3e5 100644 --- a/nptl/forward.c +++ b/nptl/forward.c @@ -56,9 +56,6 @@ name decl \ FORWARD2 (name, int, decl, params, return defretval) -FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate), - (attr, detachstate), 0) - FORWARD (pthread_attr_getinheritsched, (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0) FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit), diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index ea022eb..4594cf5 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -72,7 +72,6 @@ void __nptl_set_robust (struct pthread *); #ifdef SHARED static const struct pthread_functions pthread_functions = { - .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate, .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched, .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched, .ptr_pthread_attr_getschedparam = __pthread_attr_getschedparam, -- cgit v1.1