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:15 +0200 |
| commit | 17b67416c5ea65507c9b32aec1928afc88569eb2 (patch) | |
| tree | 7ba718bbe51468a3d80e1250710b6b428288acf3 /sysdeps/pthread | |
| parent | cf3fff1c195f859ba949a7ad86d4fca70bd99740 (diff) | |
| download | glibc-17b67416c5ea65507c9b32aec1928afc88569eb2.tar.gz glibc-17b67416c5ea65507c9b32aec1928afc88569eb2.tar.xz glibc-17b67416c5ea65507c9b32aec1928afc88569eb2.zip | |
nptl: Move mtx_destroy into libc
The symbol was moved using scripts/move-symbol-to-libc.py. The __pthread_mutex_destroy@@GLIBC_2.34 symbol is no longer neded because this commit makes __pthread_mutex_destroy@GLIBC_2.0 a compatibility symbol, so remove the new symbol version. 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_destroy.c | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 9a20996e36..591722460a 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_destroy mtx_init mtx_lock mtx_timedlock \ + mtx_init mtx_lock mtx_timedlock \ mtx_trylock mtx_unlock \ tss_create tss_delete tss_get tss_set @@ -44,6 +44,7 @@ $(libpthread-routines-var) += \ cnd_signal \ cnd_timedwait \ cnd_wait \ + mtx_destroy \ 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_destroy.c b/sysdeps/pthread/mtx_destroy.c index 2ccdc17bb6..cb7efd21a1 100644 --- a/sysdeps/pthread/mtx_destroy.c +++ b/sysdeps/pthread/mtx_destroy.c @@ -18,9 +18,18 @@ #include "thrd_priv.h" #include "pthreadP.h" +#include <shlib-compat.h> void -mtx_destroy (mtx_t *mutex) +__mtx_destroy (mtx_t *mutex) { __pthread_mutex_destroy ((pthread_mutex_t *) mutex); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __mtx_destroy, mtx_destroy, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __mtx_destroy, mtx_destroy, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__mtx_destroy, mtx_destroy) +#endif |