This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.18-177-gc8886d0
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Sep 2013 02:30:56 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-177-gc8886d0
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via c8886d0abff2b2b16870751fc2101d4f3744a406 (commit)
from f4518a17e3c7417b8cbff9634f51b7a99d433c92 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c8886d0abff2b2b16870751fc2101d4f3744a406
commit c8886d0abff2b2b16870751fc2101d4f3744a406
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Fri Sep 27 07:59:26 2013 +0530
Use the mutex member of the argumen in __libc_lock_*_recursive
diff --git a/ChangeLog b/ChangeLog
index 19152d6..167131b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-09-27 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * nptl/sysdeps/pthread/bits/libc-lock.h [_LIBC &&
+ (!NOT_IN_libc || IS_IN_libpthread)]
+ (__libc_lock_fini_recursive): Use the mutex member of the
+ argument.
+ (__libc_lock_trylock_recursive): Likewise.
+ (__libc_lock_unlock_recursive): Likewise.
+
2013-09-27 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/sh/stackguard-macros.h: New file.
diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/nptl/sysdeps/pthread/bits/libc-lock.h
index b46bca9..0b95ab7 100644
--- a/nptl/sysdeps/pthread/bits/libc-lock.h
+++ b/nptl/sysdeps/pthread/bits/libc-lock.h
@@ -87,7 +87,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
# define __libc_lock_fini_recursive(NAME) ((void) 0)
#else
# define __libc_lock_fini_recursive(NAME) \
- __libc_maybe_call (__pthread_mutex_destroy, (&(NAME)), 0)
+ __libc_maybe_call (__pthread_mutex_destroy, (&(NAME).mutex), 0)
#endif
/* Lock the recursive named lock variable. */
@@ -129,7 +129,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
})
#else
# define __libc_lock_trylock_recursive(NAME) \
- __libc_maybe_call (__pthread_mutex_trylock, (&(NAME)), 0)
+ __libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0)
#endif
/* Unlock the recursive named lock variable. */
@@ -145,7 +145,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
} while (0)
#else
# define __libc_lock_unlock_recursive(NAME) \
- __libc_maybe_call (__pthread_mutex_unlock, (&(NAME)), 0)
+ __libc_maybe_call (__pthread_mutex_unlock, (&(NAME).mutex), 0)
#endif
/* Note that for I/O cleanup handling we are using the old-style
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
nptl/sysdeps/pthread/bits/libc-lock.h | 6 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources