about summary refs log tree commit diff
path: root/nptl/Versions
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-03 08:12:11 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-03 08:15:58 +0200
commit08970190fc225b319ba456f621a62a50858fa0f6 (patch)
treed926adc67470162c0b933270987f08c37b1ff7fd /nptl/Versions
parent032a9e17a7201765228262b9b6731839dcfdf885 (diff)
downloadglibc-08970190fc225b319ba456f621a62a50858fa0f6.tar.gz
glibc-08970190fc225b319ba456f621a62a50858fa0f6.tar.xz
glibc-08970190fc225b319ba456f621a62a50858fa0f6.zip
nptl: Move mtx_trylock into libc
The symbol was moved using scripts/move-symbol-to-libc.py.

The __pthread_mutex_trylock@@GLIBC_2.34 symbol version is no longer
needed because the call is now internal to libc, so remove it with
this commit.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'nptl/Versions')
-rw-r--r--nptl/Versions3
1 files changed, 2 insertions, 1 deletions
diff --git a/nptl/Versions b/nptl/Versions
index 2c729fc605..9eea4082a0 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -137,6 +137,7 @@ libc {
     mtx_init;
     mtx_lock;
     mtx_timedlock;
+    mtx_trylock;
     thrd_current;
     thrd_equal;
     thrd_sleep;
@@ -172,6 +173,7 @@ libc {
     mtx_init;
     mtx_lock;
     mtx_timedlock;
+    mtx_trylock;
     pthread_cond_clockwait;
     pthread_condattr_getclock;
     pthread_condattr_getpshared;
@@ -383,7 +385,6 @@ libpthread {
 
   # C11 thread symbols.
   GLIBC_2.28 {
-    mtx_trylock;
     mtx_unlock;
     thrd_create;
     thrd_detach;