From f44c9a24edf0dff4fd76562975533d58c1cd6dd4 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 08:12:11 +0200 Subject: nptl: Move mtx_init into libc The symbol was moved using scripts/move-symbol-to-libc.py. The calls to __pthread_mutex_init, __pthread_mutexattr_init, __pthread_mutexattr_settype are now private and no longer need to be exported. This allows the removal of the newly added GLIBC_2.34 symbol versions for those functions. Also clean up some weak declarations in for these functions. They are not needed and potentially incorrect for static linking of mtx_init. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/pthread/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sysdeps/pthread/Makefile') diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 591722460a..bf42b6aa71 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -32,7 +32,7 @@ headers += threads.h routines += thrd_current thrd_equal thrd_sleep thrd_yield libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \ - mtx_init mtx_lock mtx_timedlock \ + mtx_lock mtx_timedlock \ mtx_trylock mtx_unlock \ tss_create tss_delete tss_get tss_set @@ -45,6 +45,7 @@ $(libpthread-routines-var) += \ cnd_timedwait \ cnd_wait \ mtx_destroy \ + mtx_init \ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \ -- cgit 1.4.1