[PATCH COMMITTED] nptl: Re-sort Versions file

Florian Weimer fweimer@redhat.com
Mon May 3 12:18:14 GMT 2021


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

---
 nptl/Versions | 4 ++--
 1 file 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 {



More information about the Libc-alpha mailing list