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 /nptl | |
| 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 'nptl')
| -rw-r--r-- | nptl/Versions | 4 | ||||
| -rw-r--r-- | nptl/pthread_mutex_destroy.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/nptl/Versions b/nptl/Versions index 414349eadc..939bed94e9 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -133,6 +133,7 @@ libc { cnd_signal; cnd_timedwait; cnd_wait; + mtx_destroy; thrd_current; thrd_equal; thrd_sleep; @@ -154,7 +155,6 @@ libc { __pthread_cleanup_routine; __pthread_getspecific; __pthread_key_create; - __pthread_mutex_destroy; __pthread_mutex_init; __pthread_mutex_lock; __pthread_mutex_unlock; @@ -168,6 +168,7 @@ libc { cnd_signal; cnd_timedwait; cnd_wait; + mtx_destroy; pthread_cond_clockwait; pthread_condattr_getclock; pthread_condattr_getpshared; @@ -380,7 +381,6 @@ libpthread { # C11 thread symbols. GLIBC_2.28 { - mtx_destroy; mtx_init; mtx_lock; mtx_timedlock; diff --git a/nptl/pthread_mutex_destroy.c b/nptl/pthread_mutex_destroy.c index 89825d44f0..54a98d4539 100644 --- a/nptl/pthread_mutex_destroy.c +++ b/nptl/pthread_mutex_destroy.c @@ -41,11 +41,12 @@ ___pthread_mutex_destroy (pthread_mutex_t *mutex) return 0; } -versioned_symbol (libc, ___pthread_mutex_destroy, __pthread_mutex_destroy, - GLIBC_2_34); -libc_hidden_ver (___pthread_mutex_destroy, __pthread_mutex_destroy) versioned_symbol (libc, ___pthread_mutex_destroy, pthread_mutex_destroy, GLIBC_2_0); +libc_hidden_ver (___pthread_mutex_destroy, __pthread_mutex_destroy) +#ifndef SHARED +strong_alias (___pthread_mutex_destroy, __pthread_mutex_destroy) +#endif #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) compat_symbol (libpthread, ___pthread_mutex_destroy, __pthread_mutex_destroy, |