From 1d714fd95da16f0d97c8c670a2c899f99c01eb45 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 16 Aug 2019 22:44:44 +0200 Subject: nptl: Move pthread_attr_getdetachstate implementation into libc Reviewed-by: Adhemerval Zanella --- nptl/Makefile | 4 ++-- nptl/Versions | 2 +- nptl/forward.c | 3 --- nptl/nptl-init.c | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) (limited to 'nptl') diff --git a/nptl/Makefile b/nptl/Makefile index 2cc47620c6..4c7ae6a561 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -31,7 +31,7 @@ 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_destroy pthread_attr_init pthread_attr_getdetachstate shared-only-routines = forward static-only-routines = pthread_atfork @@ -54,7 +54,7 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \ pthread_getconcurrency pthread_setconcurrency \ pthread_getschedparam pthread_setschedparam \ pthread_setschedprio \ - pthread_attr_getdetachstate pthread_attr_setdetachstate \ + 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 6d7dba9f3a..ae0a4cbb3f 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -49,7 +49,7 @@ libpthread { pthread_getschedparam; pthread_setschedparam; - pthread_attr_getdetachstate; pthread_attr_setdetachstate; + 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 d52b85b1c6..96454bcccf 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_getdetachstate, - (const pthread_attr_t *attr, int *detachstate), (attr, detachstate), - 0) FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate), (attr, detachstate), 0) diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index dd052a5d1b..ea022eb0df 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_getdetachstate = __pthread_attr_getdetachstate, .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate, .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched, .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched, -- cgit 1.4.1