From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 3 May 2021 12:12:55 +0000 (+0200)
Subject: nptl: Re-sort Versions file
X-Git-Tag: glibc-2.34~514
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dde76856ba6bf8b374f616bb835f211d3f1ec6ef;p=thirdparty%2Fglibc.git

nptl: Re-sort Versions file

Due to an incorrect conflict resolution, libc/GLIBC_2.2 section was no
longer sorted lexicographically.
---

diff --git a/nptl/Versions b/nptl/Versions
index 008a344f0d6..0914630be3d 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 {