* 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.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 0e508ca13aff19a32f65317c484932507e4b2d0f..3bbfb16ae7401fc91737382e83e6feda70850f4b 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+       * 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  <jakub@redhat.com>
 
        * 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 4f72c0f2130de75ff5f628dc223cc9e78fbe3069..f703eeb29f1c8052097ce250a3a60921284f6da1 100644 (file)
--- 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 8de1b1d82a049da5866e4b3329318981ae673040..fc3bf3d69e12ba4547881943071acbd2bb097d2e 100644 (file)
--- 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