diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:12:11 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:15:41 +0200 |
| commit | b7863c732e387032a49b21e9800e1755beaf5e10 (patch) | |
| tree | e39c547fb6afa713d4235046806036348f86ef8b /sysdeps/pthread | |
| parent | f44c9a24edf0dff4fd76562975533d58c1cd6dd4 (diff) | |
| download | glibc-b7863c732e387032a49b21e9800e1755beaf5e10.tar.gz glibc-b7863c732e387032a49b21e9800e1755beaf5e10.tar.xz glibc-b7863c732e387032a49b21e9800e1755beaf5e10.zip | |
nptl: Move mtx_lock into libc
The symbol was moved using scripts/move-symbol-to-libc.py. __pthread_mutex_lock@GLIBC_2.34 is not removed in this commit because it is still used from nptl/nptl-init.c. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/pthread')
| -rw-r--r-- | sysdeps/pthread/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/pthread/mtx_lock.c | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index bf42b6aa71..10ce314076 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_lock mtx_timedlock \ + mtx_timedlock \ mtx_trylock mtx_unlock \ tss_create tss_delete tss_get tss_set @@ -46,6 +46,7 @@ $(libpthread-routines-var) += \ cnd_wait \ mtx_destroy \ mtx_init \ + mtx_lock \ 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_lock.c b/sysdeps/pthread/mtx_lock.c index 61ba7c0a8d..64c5ee8707 100644 --- a/sysdeps/pthread/mtx_lock.c +++ b/sysdeps/pthread/mtx_lock.c @@ -17,10 +17,19 @@ <https://www.gnu.org/licenses/>. */ #include "thrd_priv.h" +#include <shlib-compat.h> int -mtx_lock (mtx_t *mutex) +__mtx_lock (mtx_t *mutex) { int err_code = __pthread_mutex_lock ((pthread_mutex_t *) mutex); return thrd_err_map (err_code); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __mtx_lock, mtx_lock, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __mtx_lock, mtx_lock, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__mtx_lock, mtx_lock) +#endif |