From 310e59e64cbc95bff299825b2b7f38b88f82ba4e Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 17 May 2021 09:59:14 +0200 Subject: nptl: Move pthread_getcpuclockid into libc The symbol was moved using scripts/move-symbol-to-libc.py. __libpthread_version_placeholder@@GLIBC_2.2 is needed by this change; the Versions entry for GLIBC_2.2 in libpthread had leftover symbols due to an error in a previous conflict resolution. The condition for the placeholder symbol is complicated because some architectures have earlier symbols at the GLIBC_2.2 symbol versions, so the placeholder is not required there (yet). Reviewed-by: Adhemerval Zanella --- nptl/Versions | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'nptl/Versions') diff --git a/nptl/Versions b/nptl/Versions index c76efffe37..9afbb028f2 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -127,6 +127,7 @@ libc { pthread_barrierattr_setpshared; pthread_condattr_getpshared; pthread_condattr_setpshared; + pthread_getcpuclockid; pthread_mutex_timedlock; pthread_mutexattr_getpshared; pthread_mutexattr_setpshared; @@ -285,6 +286,7 @@ libc { pthread_detach; pthread_getattr_default_np; pthread_getconcurrency; + pthread_getcpuclockid; pthread_getspecific; pthread_join; pthread_key_create; @@ -434,10 +436,7 @@ libpthread { } GLIBC_2.2 { - pthread_getcpuclockid; - pthread_yield; - pthread_rwlock_timedrdlock; - pthread_rwlock_timedwrlock; + __libpthread_version_placeholder; } GLIBC_2.2.3 { -- cgit 1.4.1