diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-01-14 15:52:46 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-01-14 15:52:46 -0800 |
| commit | 402cd98775db1478f64c9b0dbe00664b89eb2773 (patch) | |
| tree | 6f31d3ded0c66326d28e0fa447fc51f586c0ff03 | |
| parent | 346bc35c33fa08e23d7774d374b0e2586ca5dab6 (diff) | |
| download | glibc-402cd98775db1478f64c9b0dbe00664b89eb2773.tar.gz glibc-402cd98775db1478f64c9b0dbe00664b89eb2773.tar.xz glibc-402cd98775db1478f64c9b0dbe00664b89eb2773.zip | |
Actually define pthread_mutex_consistent.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Versions.def | 1 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/Versions | 4 | ||||
| -rw-r--r-- | nptl/pthread_mutex_consistent.c | 5 |
5 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index db85d0c227..518cdc7789 100644 --- 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 70de1c14fc..eab006b83f 100644 --- 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 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) |