diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-07-07 08:40:41 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-07-07 08:41:17 +0200 |
| commit | 8ec022a037788cc540c5670b0c9b1aa137bfbf97 (patch) | |
| tree | 400064397851b16fc54b18da837e2a0c969b3e3e /nptl | |
| parent | 1f9c804fbd699104adefbce9e56d2c8aa711b6b9 (diff) | |
| download | glibc-8ec022a037788cc540c5670b0c9b1aa137bfbf97.tar.gz glibc-8ec022a037788cc540c5670b0c9b1aa137bfbf97.tar.xz glibc-8ec022a037788cc540c5670b0c9b1aa137bfbf97.zip | |
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 <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Versions | 2 | ||||
| -rw-r--r-- | nptl/pthread_mutex_lock.c | 5 | ||||
| -rw-r--r-- | nptl/pthread_mutex_unlock.c | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nptl/Versions b/nptl/Versions index 060d8d5dec..0a1c75509a 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 c9e438ef37..da624f322d 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 ea88ba2986..7c15397572 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); |