From eb4f59098964501f52bb95d2d98d0291f820e936 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 24 Jul 2007 06:57:42 +0000 Subject: * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S: Fix code used when private futexes are assumed. * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S: Likewise. --- nptl/ChangeLog | 7 +++++++ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S | 2 +- nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0e508ca13a..3bbfb16ae7 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2007-07-23 Ulrich Drepper + + * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S: Fix + code used when private futexes are assumed. + * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S: + Likewise. + 2007-07-23 Jakub Jelinek * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S index 4f72c0f213..f703eeb29f 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S @@ -116,7 +116,7 @@ pthread_rwlock_timedrdlock: #ifdef __ASSUME_PRIVATE_FUTEX movl $FUTEX_PRIVATE_FLAG|FUTEX_WAIT, %esi - xorl PSHARED(%rdi), %esi + xorl PSHARED(%r12), %esi #else # if FUTEX_WAIT == 0 movl PSHARED(%r12), %esi 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 8de1b1d82a..fc3bf3d69e 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 @@ -112,7 +112,7 @@ pthread_rwlock_timedwrlock: #ifdef __ASSUME_PRIVATE_FUTEX movl $FUTEX_PRIVATE_FLAG|FUTEX_WAIT, %esi - xorl PSHARED(%rdi), %esi + xorl PSHARED(%r12), %esi #else # if FUTEX_WAIT == 0 movl PSHARED(%r12), %esi -- cgit 1.4.1