about summary refs log tree commit diff
path: root/nptl/pthread_mutex_destroy.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-03 08:12:11 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-03 08:15:15 +0200
commit17b67416c5ea65507c9b32aec1928afc88569eb2 (patch)
tree7ba718bbe51468a3d80e1250710b6b428288acf3 /nptl/pthread_mutex_destroy.c
parentcf3fff1c195f859ba949a7ad86d4fca70bd99740 (diff)
downloadglibc-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/pthread_mutex_destroy.c')
-rw-r--r--nptl/pthread_mutex_destroy.c7
1 files changed, 4 insertions, 3 deletions
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,