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.14-270-g1e4bd09
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 Sep 2011 03:55:27 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-270-g1e4bd09
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 1e4bd093e664f2889c48e63714583ef06b90d5b9 (commit)
from f99247809108c563f31005f8eb0bcb527e6cd0fe (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1e4bd093e664f2889c48e63714583ef06b90d5b9
commit 1e4bd093e664f2889c48e63714583ef06b90d5b9
Author: H.J. Lu <hongjiu.lu@intel.com>
Date: Thu Sep 8 23:53:04 2011 -0400
Fix macro used in test
diff --git a/NEWS b/NEWS
index 6f14ddd..e42adbc 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,8 @@ Version 2.15
* The following bugs are resolved with this release:
- 9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021,
- 13068, 13092, 13114, 13118, 13123, 13134, 13150
+ 9696, 12403, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007,
+ 13021, 13068, 13092, 13114, 13118, 13123, 13134, 13150
* New program pldd to list loaded object of a process
Implemented by Ulrich Drepper.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1f4cfd0..04c2baa 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-08 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #12403]
+ * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
+ (pthread_rwlock_timedwrlock): Use correct macro in test.
+ Patch by H.J. Lu <hongjiu.lu@intel.com>.
+
2011-09-06 Ulrich Drepper <drepper@gmail.com>
* sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S (sem_timedwait): Don't
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
index 16bf920..57168d9 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
@@ -190,7 +190,7 @@ pthread_rwlock_timedwrlock:
7: movq %rdx, %rax
-#ifndef __ASSUME_PRIVATE_FUTEX
+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
addq $16, %rsp
cfi_adjust_cfa_offset(-16)
popq %r14
-----------------------------------------------------------------------
Summary of changes:
NEWS | 4 ++--
nptl/ChangeLog | 7 +++++++
.../sysv/linux/x86_64/pthread_rwlock_timedwrlock.S | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources