diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:44:49 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:44:49 +0200 |
| commit | fd42022a10f2e54cbd1e51b561097105d8ef51c5 (patch) | |
| tree | 80f9207acc279b0ee40955528dd9e896b054d025 /nptl | |
| parent | a2b0f2e1864f03084138a105e1d5f2cf86a62425 (diff) | |
| download | glibc-fd42022a10f2e54cbd1e51b561097105d8ef51c5.zip glibc-fd42022a10f2e54cbd1e51b561097105d8ef51c5.tar.gz glibc-fd42022a10f2e54cbd1e51b561097105d8ef51c5.tar.bz2 | |
nptl: Move pthread_mutexattr_destroy into libc
And __pthread_mutexattr_destroy as a compat symbol (so no
GLIBC_2.34 symbol version is added for it).
The symbols were moved using scripts/move-symbol-to-libc.py.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 5 | ||||
| -rw-r--r-- | nptl/pthread_mutexattr_destroy.c | 13 |
3 files changed, 14 insertions, 6 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 8e01515..139945a 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -103,6 +103,7 @@ routines = \ pthread_mutex_timedlock \ pthread_mutex_trylock \ pthread_mutex_unlock \ + pthread_mutexattr_destroy \ pthread_once \ pthread_rwlock_rdlock \ pthread_rwlock_unlock \ @@ -162,7 +163,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_mutexattr_destroy \ pthread_mutexattr_getprioceiling \ pthread_mutexattr_getprotocol \ pthread_mutexattr_getpshared \ diff --git a/nptl/Versions b/nptl/Versions index ab79ae2..51857e0 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -7,6 +7,7 @@ libc { __pthread_mutex_lock; __pthread_mutex_trylock; __pthread_mutex_unlock; + __pthread_mutexattr_destroy; __pthread_once; __pthread_setspecific; _pthread_cleanup_pop; @@ -47,6 +48,7 @@ libc { pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock; + pthread_mutexattr_destroy; pthread_once; pthread_self; pthread_setcancelstate; @@ -134,6 +136,7 @@ libc { pthread_mutex_consistent; pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; + pthread_mutexattr_destroy; pthread_once; pthread_rwlock_rdlock; pthread_rwlock_unlock; @@ -197,7 +200,6 @@ libpthread { _IO_funlockfile; __errno_location; __h_errno_location; - __pthread_mutexattr_destroy; __pthread_mutexattr_init; __pthread_mutexattr_settype; _exit; @@ -208,7 +210,6 @@ libpthread { pthread_create; pthread_detach; pthread_join; - pthread_mutexattr_destroy; pthread_mutexattr_getkind_np; pthread_mutexattr_init; pthread_mutexattr_setkind_np; diff --git a/nptl/pthread_mutexattr_destroy.c b/nptl/pthread_mutexattr_destroy.c index 2c2ec5a..32ead52 100644 --- a/nptl/pthread_mutexattr_destroy.c +++ b/nptl/pthread_mutexattr_destroy.c @@ -17,11 +17,18 @@ <https://www.gnu.org/licenses/>. */ #include <pthreadP.h> - +#include <shlib-compat.h> int -__pthread_mutexattr_destroy (pthread_mutexattr_t *attr) +___pthread_mutexattr_destroy (pthread_mutexattr_t *attr) { return 0; } -strong_alias (__pthread_mutexattr_destroy, pthread_mutexattr_destroy) +versioned_symbol (libc, ___pthread_mutexattr_destroy, + pthread_mutexattr_destroy, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) +compat_symbol (libc, ___pthread_mutexattr_destroy, + pthread_mutexattr_destroy, GLIBC_2_0); +compat_symbol (libc, ___pthread_mutexattr_destroy, + __pthread_mutexattr_destroy, GLIBC_2_0); +#endif |