public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] nptl: Re-sort Versions file
@ 2021-05-03 12:17 Florian Weimer
  0 siblings, 0 replies; only message in thread
From: Florian Weimer @ 2021-05-03 12:17 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=dde76856ba6bf8b374f616bb835f211d3f1ec6ef

commit dde76856ba6bf8b374f616bb835f211d3f1ec6ef
Author: Florian Weimer <fweimer@redhat.com>
Date:   Mon May 3 14:12:55 2021 +0200

    nptl: Re-sort Versions file
    
    Due to an incorrect conflict resolution, libc/GLIBC_2.2 section was no
    longer sorted lexicographically.

Diff:
---
 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 {


^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2021-05-03 12:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-03 12:17 [glibc] nptl: Re-sort Versions file Florian Weimer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).