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:22 +0200 |
| commit | f44c9a24edf0dff4fd76562975533d58c1cd6dd4 (patch) | |
| tree | 196eb57d4feb0faca29e34dbb413c76cb4c761b6 /sysdeps/nptl | |
| parent | 17b67416c5ea65507c9b32aec1928afc88569eb2 (diff) | |
| download | glibc-f44c9a24edf0dff4fd76562975533d58c1cd6dd4.tar.gz glibc-f44c9a24edf0dff4fd76562975533d58c1cd6dd4.tar.xz glibc-f44c9a24edf0dff4fd76562975533d58c1cd6dd4.zip | |
nptl: Move mtx_init into libc
The symbol was moved using scripts/move-symbol-to-libc.py. The calls to __pthread_mutex_init, __pthread_mutexattr_init, __pthread_mutexattr_settype are now private and no longer need to be exported. This allows the removal of the newly added GLIBC_2.34 symbol versions for those functions. Also clean up some weak declarations in <libc-lockP.h> for these functions. They are not needed and potentially incorrect for static linking of mtx_init. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/nptl')
| -rw-r--r-- | sysdeps/nptl/libc-lockP.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h index aad9c9778c..239bd5ed86 100644 --- a/sysdeps/nptl/libc-lockP.h +++ b/sysdeps/nptl/libc-lockP.h @@ -269,13 +269,9 @@ extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); libc_hidden_proto (__pthread_mutex_lock) extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); libc_hidden_proto (__pthread_mutex_unlock) -extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr); extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr); -extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr, - int __kind); - extern int __pthread_rwlock_init (pthread_rwlock_t *__rwlock, const pthread_rwlockattr_t *__attr); @@ -307,9 +303,7 @@ libc_hidden_proto (__pthread_setcancelstate) #ifndef __NO_WEAK_PTHREAD_ALIASES # ifdef weak_extern weak_extern (__pthread_mutex_trylock) -weak_extern (__pthread_mutexattr_init) weak_extern (__pthread_mutexattr_destroy) -weak_extern (__pthread_mutexattr_settype) weak_extern (__pthread_rwlock_init) weak_extern (__pthread_rwlock_destroy) weak_extern (__pthread_rwlock_tryrdlock) @@ -318,9 +312,7 @@ weak_extern (__pthread_initialize) weak_extern (__pthread_atfork) # else # pragma weak __pthread_mutex_trylock -# pragma weak __pthread_mutexattr_init # pragma weak __pthread_mutexattr_destroy -# pragma weak __pthread_mutexattr_settype # pragma weak __pthread_rwlock_destroy # pragma weak __pthread_rwlock_tryrdlock # pragma weak __pthread_rwlock_trywrlock |