From 8ec022a037788cc540c5670b0c9b1aa137bfbf97 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 7 Jul 2021 08:40:41 +0200 Subject: nptl: Remove GLIBC_2.34 versions of __pthread_mutex_lock, __pthread_mutex_unlock Now that there are no internal users anymore, these new symbol versions can be removed from the public ABI. The compatibility symbols remain. Reviewed-by: Adhemerval Zanella --- nptl/Versions | 2 -- nptl/pthread_mutex_lock.c | 5 +++-- nptl/pthread_mutex_unlock.c | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'nptl') diff --git a/nptl/Versions b/nptl/Versions index 060d8d5d..0a1c755 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -253,8 +253,6 @@ libc { GLIBC_2.34 { __pthread_cleanup_routine; __pthread_key_create; - __pthread_mutex_lock; - __pthread_mutex_unlock; __pthread_register_cancel; __pthread_register_cancel_defer; __pthread_unregister_cancel; diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c index c9e438e..da624f3 100644 --- a/nptl/pthread_mutex_lock.c +++ b/nptl/pthread_mutex_lock.c @@ -609,9 +609,10 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) } #if PTHREAD_MUTEX_VERSIONS -versioned_symbol (libpthread, ___pthread_mutex_lock, __pthread_mutex_lock, - GLIBC_2_34); libc_hidden_ver (___pthread_mutex_lock, __pthread_mutex_lock) +# ifndef SHARED +strong_alias (___pthread_mutex_lock, __pthread_mutex_lock) +# endif versioned_symbol (libpthread, ___pthread_mutex_lock, pthread_mutex_lock, GLIBC_2_0); diff --git a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c index ea88ba2..7c15397 100644 --- a/nptl/pthread_mutex_unlock.c +++ b/nptl/pthread_mutex_unlock.c @@ -368,9 +368,10 @@ ___pthread_mutex_unlock (pthread_mutex_t *mutex) { return __pthread_mutex_unlock_usercnt (mutex, 1); } -versioned_symbol (libpthread, ___pthread_mutex_unlock, __pthread_mutex_unlock, - GLIBC_2_34); libc_hidden_ver (___pthread_mutex_unlock, __pthread_mutex_unlock) +#ifndef SHARED +strong_alias (___pthread_mutex_unlock, __pthread_mutex_unlock) +#endif versioned_symbol (libpthread, ___pthread_mutex_unlock, pthread_mutex_unlock, GLIBC_2_0); -- cgit v1.1