From 1e4bd093e664f2889c48e63714583ef06b90d5b9 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 8 Sep 2011 23:53:04 -0400 Subject: [PATCH] Fix macro used in test --- NEWS | 4 ++-- nptl/ChangeLog | 7 +++++++ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) 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 + + [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 . + 2011-09-06 Ulrich Drepper * 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 -- 2.7.4