diff options
author | Andreas Schwab <schwab@redhat.com> | 2010-01-15 10:44:48 +0100 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2010-01-15 10:51:34 +0100 |
commit | 2384b50e7d567cc26553443b6790b3062d405463 (patch) | |
tree | a5ed604cf90256b1fa8e075b98bb0c668d671b55 /nptl | |
parent | e6073eebddb6c1c58d23175826515a3522c785da (diff) | |
parent | 5306d3613a3e71d8ede6529e858e2398223ac3da (diff) |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/ChangeLog | 14 | ||||
-rw-r--r-- | nptl/Versions | 5 | ||||
-rw-r--r-- | nptl/pthread_mutex_consistent.c | 5 | ||||
-rw-r--r-- | nptl/pthread_mutexattr_getrobust.c | 5 | ||||
-rw-r--r-- | nptl/pthread_mutexattr_setrobust.c | 5 | ||||
-rw-r--r-- | nptl/sysdeps/pthread/pthread.h | 10 |
6 files changed, 31 insertions, 13 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index c8839e81f3..1da9bc3b4e 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,17 @@ +2010-01-14 Ulrich Drepper <drepper@redhat.com> + + * Versions: Add pthread_mutex_consistent, pthread_mutexattr_getrobust, + and pthread_mutexattr_setrobust for GLIBC_2.12. + * pthread_mutex_consistent.c: Define alias pthread_mutex_consistent. + * pthread_mutexattr_getrobust.c: Define alias + pthread_mutexattr_getrobust. + * pthread_mutexattr_setrobust.c: Define alias + pthread_mutexattr_setrobust. + +2010-01-12 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/pthread/pthread.h: Cleanup. Fix up for XPG7. + 2010-01-08 Ulrich Drepper <drepper@redhat.com> * sysdeps/pthread/pthread.h: Fix pthread_mutex_consistent declaration. diff --git a/nptl/Versions b/nptl/Versions index 09098bf987..1f2de79fd4 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -244,6 +244,11 @@ libpthread { pthread_sigqueue; }; + GLIBC_2.12 { + pthread_mutex_consistent; pthread_mutexattr_getrobust; + pthread_mutexattr_setrobust; + }; + 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) diff --git a/nptl/pthread_mutexattr_getrobust.c b/nptl/pthread_mutexattr_getrobust.c index 5ec43d1f7c..9e61bb0f06 100644 --- a/nptl/pthread_mutexattr_getrobust.c +++ b/nptl/pthread_mutexattr_getrobust.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2005. @@ -21,7 +21,7 @@ int -pthread_mutexattr_getrobust_np (attr, robustness) +pthread_mutexattr_getrobust (attr, robustness) const pthread_mutexattr_t *attr; int *robustness; { @@ -34,3 +34,4 @@ pthread_mutexattr_getrobust_np (attr, robustness) return 0; } +weak_alias (pthread_mutexattr_getrobust, pthread_mutexattr_getrobust_np) diff --git a/nptl/pthread_mutexattr_setrobust.c b/nptl/pthread_mutexattr_setrobust.c index cf95e35b6f..df51ef53b0 100644 --- a/nptl/pthread_mutexattr_setrobust.c +++ b/nptl/pthread_mutexattr_setrobust.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 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_mutexattr_setrobust_np (attr, robustness) +pthread_mutexattr_setrobust (attr, robustness) pthread_mutexattr_t *attr; int robustness; { @@ -41,3 +41,4 @@ pthread_mutexattr_setrobust_np (attr, robustness) return 0; } +weak_alias (pthread_mutexattr_setrobust, pthread_mutexattr_setrobust_np) diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index 8a946ffc3a..b84fd5c7a4 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -25,8 +25,6 @@ #include <sched.h> #include <time.h> -#define __need_sigset_t -#include <signal.h> #include <bits/pthreadtypes.h> #include <bits/setjmp.h> #include <bits/wordsize.h> @@ -49,7 +47,7 @@ enum PTHREAD_MUTEX_RECURSIVE_NP, PTHREAD_MUTEX_ERRORCHECK_NP, PTHREAD_MUTEX_ADAPTIVE_NP -#ifdef __USE_UNIX98 +#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 , PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_TIMED_NP, PTHREAD_MUTEX_RECURSIVE = PTHREAD_MUTEX_RECURSIVE_NP, @@ -748,7 +746,6 @@ extern int pthread_mutex_unlock (pthread_mutex_t *__mutex) __THROW __nonnull ((1)); -#ifdef __USE_UNIX98 /* Get the priority ceiling of MUTEX. */ extern int pthread_mutex_getprioceiling (__const pthread_mutex_t * __restrict __mutex, @@ -761,7 +758,6 @@ extern int pthread_mutex_setprioceiling (pthread_mutex_t *__restrict __mutex, int __prioceiling, int *__restrict __old_ceiling) __THROW __nonnull ((1, 3)); -#endif #ifdef __USE_XOPEN2K8 @@ -797,7 +793,7 @@ extern int pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr, int __pshared) __THROW __nonnull ((1)); -#ifdef __USE_UNIX98 +#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 /* Return in *KIND the mutex kind attribute in *ATTR. */ extern int pthread_mutexattr_gettype (__const pthread_mutexattr_t *__restrict __attr, int *__restrict __kind) @@ -808,6 +804,7 @@ extern int pthread_mutexattr_gettype (__const pthread_mutexattr_t *__restrict PTHREAD_MUTEX_DEFAULT). */ extern int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind) __THROW __nonnull ((1)); +#endif /* Return in *PROTOCOL the mutex protocol attribute in *ATTR. */ extern int pthread_mutexattr_getprotocol (__const pthread_mutexattr_t * @@ -831,7 +828,6 @@ extern int pthread_mutexattr_getprioceiling (__const pthread_mutexattr_t * extern int pthread_mutexattr_setprioceiling (pthread_mutexattr_t *__attr, int __prioceiling) __THROW __nonnull ((1)); -#endif #ifdef __USE_XOPEN2K /* Get the robustness flag of the mutex attribute ATTR. */ |