aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-03 14:12:55 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-03 14:12:55 +0200
commitdde76856ba6bf8b374f616bb835f211d3f1ec6ef (patch)
treed1863c418a2fdf2840b1c5d8270ca738eb6d2ad3 /nptl
parentcf2c57526ba4b57e6863ad4db8a868e2678adce8 (diff)
downloadglibc-dde76856ba6bf8b374f616bb835f211d3f1ec6ef.tar
glibc-dde76856ba6bf8b374f616bb835f211d3f1ec6ef.tar.gz
glibc-dde76856ba6bf8b374f616bb835f211d3f1ec6ef.tar.bz2
glibc-dde76856ba6bf8b374f616bb835f211d3f1ec6ef.zip
nptl: Re-sort Versions file
Due to an incorrect conflict resolution, libc/GLIBC_2.2 section was no longer sorted lexicographically.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Versions4
1 files changed, 2 insertions, 2 deletions
diff --git a/nptl/Versions b/nptl/Versions
index 008a344f0d..0914630be3 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -93,13 +93,13 @@ libc {
pthread_mutex_timedlock;
pthread_mutexattr_getpshared;
pthread_mutexattr_setpshared;
+ pthread_rwlock_timedrdlock;
+ pthread_rwlock_timedwrlock;
pthread_spin_destroy;
pthread_spin_init;
pthread_spin_lock;
pthread_spin_trylock;
pthread_spin_unlock;
- pthread_rwlock_timedrdlock;
- pthread_rwlock_timedwrlock;
pthread_yield;
}
GLIBC_2.2.3 {