Actually define pthread_mutex_consistent.

diff --git a/ChangeLog b/ChangeLog
index db85d0c22750e38de65c488a76a30aec636bb459..518cdc77895fc99618060b5fb5817f4007d2654a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
+       * Versions.def: Add GLIBC_2.12 for libpthread.
+
        [BZ #11126]
        * malloc/malloc.c (malloc_info): Initialize malloc if not already
        done.  Handle empty bin lists.

diff --git a/Versions.def b/Versions.def
index 70de1c14fca721176a52b1b0bbfb891caf13075c..eab006b83f6a98e72fec49bd1938179876c53e06 100644 (file)
--- a/Versions.def
+++ b/Versions.def
@@ -91,6 +91,7 @@ libpthread {
   GLIBC_2.4
   GLIBC_2.6
   GLIBC_2.11
+  GLIBC_2.12
   GLIBC_PRIVATE
 }
 libresolv {

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index aa28d8231dcc197023742a571c499aa6914927d9..66f5255e2acff3edf8d8c1b1b03c987901778f4c 100644 (file)
--- 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 09098bf9879b8756646ee925b364c4f8365f44cb..dcdd5eb3be714b2d96fb3360e73ff6b52fee47af 100644 (file)
--- 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 d4f287b7558a6dc1575aa1a9a2629b4f15372680..9ca3e1397e55484bf698447946ffcb71f090002a 100644 (file)
--- 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)