nptl: Move mtx_timedlock into libc

The symbol was moved using scripts/move-symbol-to-libc.py.

The __pthread_mutex_timedlock@@GLIBC_PRIVATE export is no longer
needed, so it is removed with this commit.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer 2021-05-03 08:12:11 +02:00
parent b7863c732e
commit 032a9e17a7
66 changed files with 87 additions and 43 deletions

View File

@ -136,6 +136,7 @@ libc {
mtx_destroy;
mtx_init;
mtx_lock;
mtx_timedlock;
thrd_current;
thrd_equal;
thrd_sleep;
@ -170,6 +171,7 @@ libc {
mtx_destroy;
mtx_init;
mtx_lock;
mtx_timedlock;
pthread_cond_clockwait;
pthread_condattr_getclock;
pthread_condattr_getpshared;
@ -238,7 +240,6 @@ libc {
__pthread_getattr_default_np;
__pthread_key_delete;
__pthread_keys;
__pthread_mutex_timedlock;
__pthread_mutex_unlock_usercnt;
__pthread_setcancelstate;
__pthread_tpp_change_priority;
@ -382,7 +383,6 @@ libpthread {
# C11 thread symbols.
GLIBC_2.28 {
mtx_timedlock;
mtx_trylock;
mtx_unlock;
thrd_create;

View File

@ -631,11 +631,13 @@ ___pthread_mutex_timedlock (pthread_mutex_t *mutex,
return __pthread_mutex_timedlock64 (mutex, &ts64);
}
#endif /* __TIMESPEC64 != 64 */
versioned_symbol (libc, ___pthread_mutex_timedlock,
__pthread_mutex_timedlock, GLIBC_PRIVATE);
libc_hidden_ver (___pthread_mutex_timedlock, __pthread_mutex_timedlock)
versioned_symbol (libc, ___pthread_mutex_timedlock,
pthread_mutex_timedlock, GLIBC_2_34);
libc_hidden_ver (___pthread_mutex_timedlock, __pthread_mutex_timedlock)
#ifndef SHARED
strong_alias (___pthread_mutex_timedlock, __pthread_mutex_timedlock)
#endif
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34)
compat_symbol (libpthread, ___pthread_mutex_timedlock,
pthread_mutex_timedlock, GLIBC_2_2);

View File

@ -32,7 +32,6 @@ headers += threads.h
routines += thrd_current thrd_equal thrd_sleep thrd_yield
libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \
mtx_timedlock \
mtx_trylock mtx_unlock \
tss_create tss_delete tss_get tss_set
@ -47,6 +46,7 @@ $(libpthread-routines-var) += \
mtx_destroy \
mtx_init \
mtx_lock \
mtx_timedlock \
tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \

View File

@ -2209,6 +2209,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2265,6 +2266,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.17 sem_unlink F
GLIBC_2.17 sem_wait F
GLIBC_2.18 pthread_getattr_default_np F
GLIBC_2.18 pthread_setattr_default_np F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2102,6 +2102,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2346,6 +2347,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.2 pthread_yield F
GLIBC_2.2 sem_timedwait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -1266,6 +1266,7 @@ GLIBC_2.32 mtrace F
GLIBC_2.32 mtx_destroy F
GLIBC_2.32 mtx_init F
GLIBC_2.32 mtx_lock F
GLIBC_2.32 mtx_timedlock F
GLIBC_2.32 munlock F
GLIBC_2.32 munlockall F
GLIBC_2.32 munmap F
@ -2024,6 +2025,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -13,7 +13,6 @@ GLIBC_2.32 __pthread_unregister_cancel_restore F
GLIBC_2.32 flockfile F
GLIBC_2.32 ftrylockfile F
GLIBC_2.32 funlockfile F
GLIBC_2.32 mtx_timedlock F
GLIBC_2.32 mtx_trylock F
GLIBC_2.32 mtx_unlock F
GLIBC_2.32 pthread_attr_getaffinity_np F

View File

@ -130,6 +130,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -189,6 +190,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -3,7 +3,6 @@ GLIBC_2.12 pthread_getname_np F
GLIBC_2.12 pthread_setname_np F
GLIBC_2.18 pthread_getattr_default_np F
GLIBC_2.18 pthread_setattr_default_np F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -130,6 +130,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -186,6 +187,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -3,7 +3,6 @@ GLIBC_2.12 pthread_getname_np F
GLIBC_2.12 pthread_setname_np F
GLIBC_2.18 pthread_getattr_default_np F
GLIBC_2.18 pthread_setattr_default_np F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -1321,6 +1321,7 @@ GLIBC_2.29 mtrace F
GLIBC_2.29 mtx_destroy F
GLIBC_2.29 mtx_init F
GLIBC_2.29 mtx_lock F
GLIBC_2.29 mtx_timedlock F
GLIBC_2.29 munlock F
GLIBC_2.29 munlockall F
GLIBC_2.29 munmap F
@ -2208,6 +2209,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -13,7 +13,6 @@ GLIBC_2.29 __pthread_unregister_cancel_restore F
GLIBC_2.29 flockfile F
GLIBC_2.29 ftrylockfile F
GLIBC_2.29 funlockfile F
GLIBC_2.29 mtx_timedlock F
GLIBC_2.29 mtx_trylock F
GLIBC_2.29 mtx_unlock F
GLIBC_2.29 pthread_attr_getaffinity_np F

View File

@ -1941,6 +1941,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2159,6 +2160,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -61,7 +61,6 @@ GLIBC_2.2 sem_unlink F
GLIBC_2.2 sem_wait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2115,6 +2115,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2336,6 +2337,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.2 pthread_yield F
GLIBC_2.2 sem_timedwait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -1976,6 +1976,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2193,6 +2194,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -61,7 +61,6 @@ GLIBC_2.2 sem_unlink F
GLIBC_2.2 sem_wait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -131,6 +131,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -190,6 +191,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -3,7 +3,6 @@ GLIBC_2.12 pthread_getname_np F
GLIBC_2.12 pthread_setname_np F
GLIBC_2.18 pthread_getattr_default_np F
GLIBC_2.18 pthread_setattr_default_np F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2058,6 +2058,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2279,6 +2280,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.2 pthread_yield F
GLIBC_2.2 sem_timedwait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2200,6 +2200,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2259,6 +2260,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.18 sem_timedwait F
GLIBC_2.18 sem_trywait F
GLIBC_2.18 sem_unlink F
GLIBC_2.18 sem_wait F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2200,6 +2200,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2256,6 +2257,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.18 sem_timedwait F
GLIBC_2.18 sem_trywait F
GLIBC_2.18 sem_unlink F
GLIBC_2.18 sem_wait F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2028,6 +2028,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2242,6 +2243,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -68,7 +68,6 @@ GLIBC_2.2 sem_unlink F
GLIBC_2.2 sem_wait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2026,6 +2026,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2240,6 +2241,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -68,7 +68,6 @@ GLIBC_2.2 sem_unlink F
GLIBC_2.2 sem_wait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2034,6 +2034,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2248,6 +2249,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -2029,6 +2029,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2242,6 +2243,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -17,27 +17,34 @@
<https://www.gnu.org/licenses/>. */
#include <time.h>
#include <shlib-compat.h>
#include "thrd_priv.h"
int
__mtx_timedlock64 (mtx_t *restrict mutex,
const struct __timespec64 *restrict time_point)
___mtx_timedlock64 (mtx_t *restrict mutex,
const struct __timespec64 *restrict time_point)
{
int err_code = __pthread_mutex_timedlock64 ((pthread_mutex_t *)mutex,
time_point);
return thrd_err_map (err_code);
}
#if __TIMESIZE != 64
libpthread_hidden_def (__mtx_timedlock64)
#if __TIMESIZE == 64
strong_alias (___mtx_timedlock64, ___mtx_timedlock)
#else
libc_hidden_ver (___mtx_timedlock64, __mtx_timedlock64)
int
__mtx_timedlock (mtx_t *restrict mutex,
const struct timespec *restrict time_point)
___mtx_timedlock (mtx_t *restrict mutex,
const struct timespec *restrict time_point)
{
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*time_point);
return __mtx_timedlock64 (mutex, &ts64);
}
#endif /* __TIMESIZE == 64 */
versioned_symbol (libc, ___mtx_timedlock, mtx_timedlock, GLIBC_2_34);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34)
compat_symbol (libpthread, ___mtx_timedlock, mtx_timedlock, GLIBC_2_28);
#endif
weak_alias (__mtx_timedlock, mtx_timedlock)

View File

@ -2242,6 +2242,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2298,6 +2299,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.21 sem_timedwait F
GLIBC_2.21 sem_trywait F
GLIBC_2.21 sem_unlink F
GLIBC_2.21 sem_wait F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2062,6 +2062,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2306,6 +2307,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.2 pthread_yield F
GLIBC_2.2 sem_timedwait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2066,6 +2066,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2339,6 +2340,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -130,6 +130,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2160,6 +2161,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -3,7 +3,6 @@ GLIBC_2.12 pthread_getname_np F
GLIBC_2.12 pthread_setname_np F
GLIBC_2.18 pthread_getattr_default_np F
GLIBC_2.18 pthread_setattr_default_np F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2299,6 +2299,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2461,6 +2462,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.17 sem_unlink F
GLIBC_2.17 sem_wait F
GLIBC_2.18 pthread_getattr_default_np F
GLIBC_2.18 pthread_setattr_default_np F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -1268,6 +1268,7 @@ GLIBC_2.33 mtrace F
GLIBC_2.33 mtx_destroy F
GLIBC_2.33 mtx_init F
GLIBC_2.33 mtx_lock F
GLIBC_2.33 mtx_timedlock F
GLIBC_2.33 munlock F
GLIBC_2.33 munlockall F
GLIBC_2.33 munmap F
@ -2026,6 +2027,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -13,7 +13,6 @@ GLIBC_2.33 __pthread_unregister_cancel_restore F
GLIBC_2.33 flockfile F
GLIBC_2.33 ftrylockfile F
GLIBC_2.33 funlockfile F
GLIBC_2.33 mtx_timedlock F
GLIBC_2.33 mtx_trylock F
GLIBC_2.33 mtx_unlock F
GLIBC_2.33 pthread_attr_getaffinity_np F

View File

@ -2170,6 +2170,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2226,6 +2227,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.27 sem_timedwait F
GLIBC_2.27 sem_trywait F
GLIBC_2.27 sem_unlink F
GLIBC_2.27 sem_wait F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2071,6 +2071,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2304,6 +2305,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -70,7 +70,6 @@ GLIBC_2.2 pthread_yield F
GLIBC_2.2 sem_timedwait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -1968,6 +1968,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2197,6 +2198,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -62,7 +62,6 @@ GLIBC_2.2 sem_unlink F
GLIBC_2.2 sem_wait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -1945,6 +1945,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2166,6 +2167,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -61,7 +61,6 @@ GLIBC_2.2 sem_unlink F
GLIBC_2.2 sem_wait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -1945,6 +1945,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2163,6 +2164,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -61,7 +61,6 @@ GLIBC_2.2 sem_unlink F
GLIBC_2.2 sem_wait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2065,6 +2065,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2295,6 +2296,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.2 pthread_yield F
GLIBC_2.2 sem_timedwait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -1998,6 +1998,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2214,6 +2215,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -61,7 +61,6 @@ GLIBC_2.2 sem_unlink F
GLIBC_2.2 sem_wait F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -28,7 +28,7 @@ extern int __cnd_timedwait64 (cnd_t *restrict cond, mtx_t *restrict mutex,
libc_hidden_proto (__cnd_timedwait64)
extern int __mtx_timedlock64 (mtx_t *restrict mutex,
const struct __timespec64 *restrict time_point);
libpthread_hidden_proto (__mtx_timedlock64)
libc_hidden_proto (__mtx_timedlock64)
extern int __thrd_sleep64 (const struct __timespec64 *time_point,
struct __timespec64 *remaining);
libc_hidden_proto (__thrd_sleep64)

View File

@ -1957,6 +1957,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2175,6 +2176,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -60,7 +60,6 @@ GLIBC_2.2.5 sem_trywait F
GLIBC_2.2.5 sem_unlink F
GLIBC_2.2.5 sem_wait F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F

View File

@ -2222,6 +2222,7 @@ GLIBC_2.28 fcntl64 F
GLIBC_2.28 mtx_destroy F
GLIBC_2.28 mtx_init F
GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_current F
@ -2280,6 +2281,7 @@ GLIBC_2.34 cnd_wait F
GLIBC_2.34 mtx_destroy F
GLIBC_2.34 mtx_init F
GLIBC_2.34 mtx_lock F
GLIBC_2.34 mtx_timedlock F
GLIBC_2.34 pthread_cond_clockwait F
GLIBC_2.34 pthread_condattr_getclock F
GLIBC_2.34 pthread_condattr_getpshared F

View File

@ -69,7 +69,6 @@ GLIBC_2.16 sem_unlink F
GLIBC_2.16 sem_wait F
GLIBC_2.18 pthread_getattr_default_np F
GLIBC_2.18 pthread_setattr_default_np F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
GLIBC_2.28 thrd_create F