summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/Versions4
-rw-r--r--nptl/pthread_mutex_consistent.c5
3 files changed, 12 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index aa28d8231d..66f5255e2a 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Ulrich Drepper  <drepper@redhat.com>
+
+	* Versions: Add pthread_mutex_consistent for GLIBC_2.12.
+	* pthread_mutex_consistent.c: Define alias pthread_mutex_consistent.
+
 2010-01-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/pthread/pthread.h: Cleanup.  Fix up for XPG7.
diff --git a/nptl/Versions b/nptl/Versions
index 09098bf987..dcdd5eb3be 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -244,6 +244,10 @@ libpthread {
     pthread_sigqueue;
   };
 
+  GLIBC_2.12 {
+    pthread_mutex_consistent;
+  };
+
   GLIBC_PRIVATE {
     __pthread_initialize_minimal;
     __pthread_clock_gettime; __pthread_clock_settime;
diff --git a/nptl/pthread_mutex_consistent.c b/nptl/pthread_mutex_consistent.c
index d4f287b755..9ca3e1397e 100644
--- a/nptl/pthread_mutex_consistent.c
+++ b/nptl/pthread_mutex_consistent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2005.
 
@@ -22,7 +22,7 @@
 
 
 int
-pthread_mutex_consistent_np (mutex)
+pthread_mutex_consistent (mutex)
      pthread_mutex_t *mutex;
 {
   /* Test whether this is a robust mutex with a dead owner.  */
@@ -34,3 +34,4 @@ pthread_mutex_consistent_np (mutex)
 
   return 0;
 }
+weak_alias (pthread_mutex_consistent, pthread_mutex_consistent_np)