From ae4a5ca07496e8ae8a74924095f0161d4c759328 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 08:12:12 +0200 Subject: nptl: Move mtx_unlock into libc The symbol was moved using scripts/move-symbol-to-libc.py. __pthread_mutex_unlock@GLIBC_2.34 is not removed in this commit because it is still used from nptl/nptl-init.c. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/pthread/Makefile | 2 +- sysdeps/pthread/mtx_unlock.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'sysdeps/pthread') diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index dbff46dd45..6f204ccab2 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -32,7 +32,6 @@ headers += threads.h routines += thrd_current thrd_equal thrd_sleep thrd_yield libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \ - mtx_unlock \ tss_create tss_delete tss_get tss_set $(libpthread-routines-var) += \ @@ -48,6 +47,7 @@ $(libpthread-routines-var) += \ mtx_lock \ mtx_timedlock \ mtx_trylock \ + mtx_unlock \ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \ diff --git a/sysdeps/pthread/mtx_unlock.c b/sysdeps/pthread/mtx_unlock.c index 04cd748887..d3765cdca1 100644 --- a/sysdeps/pthread/mtx_unlock.c +++ b/sysdeps/pthread/mtx_unlock.c @@ -17,10 +17,19 @@ . */ #include "thrd_priv.h" +#include int -mtx_unlock (mtx_t *mutex) +__mtx_unlock (mtx_t *mutex) { int err_code = __pthread_mutex_unlock ((pthread_mutex_t *) mutex); return thrd_err_map (err_code); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __mtx_unlock, mtx_unlock, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __mtx_unlock, mtx_unlock, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__mtx_unlock, mtx_unlock) +#endif -- cgit v1.2.3