diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-03-17 10:11:31 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-03-17 10:11:31 +0000 |
| commit | 46a32546c924213322a0d0d5b6d636d2f58094c0 (patch) | |
| tree | 2266b13e8fd91a2595fc1cadf0bef12cce712589 /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S | |
| parent | fb2ee178fa1e50dd1ec4b8ff5300f13afbbb1dd9 (diff) | |
Update.
2003-03-17 Ulrich Drepper <drepper@redhat.com>
* localedata/en_ZA: hanged %x for LC_TIME to use dd/mm/ccyy.
Added ^ to LC_MESSAGES regex "^[yY].*".
Confirmed LC_PAPER adn LC_MEASUREMENT settings.
Added country and language names to LC_ADDRESS.
Added missing info for LC_TELEPHONE.
Patch by Dwayne Bailey <dwayne@obsidian.co.za>.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S index 3c8acc1c25..9da9af8d01 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -171,8 +171,8 @@ __pthread_cond_timedwait: movq wakeup_seq(%rdi), %r12 - cmpq 40(%rsp), %rax - jb 15f + cmpq 40(%rsp), %r12 + jbe 15f cmpq %rax, %r12 ja 9f @@ -181,10 +181,10 @@ __pthread_cond_timedwait: jne 8b 13: incq wakeup_seq(%rdi) - movq $ETIMEDOUT, %rsi + movq $ETIMEDOUT, %r14 jmp 14f -9: xorq %rsi, %rsi +9: xorq %r14, %r14 14: incq woken_seq(%rdi) LOCK @@ -203,7 +203,7 @@ __pthread_cond_timedwait: callq __pthread_mutex_lock_internal testq %rax, %rax - cmoveq %rsi, %rax + cmoveq %r14, %rax 18: addq $80, %rsp popq %r14 |