diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-07-02 11:21:44 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-07-02 11:25:12 +0200 |
| commit | ce7d1719493b21690826ed0f64ab70b513f145b5 (patch) | |
| tree | 267a62315efc29d8fca3d539d42674dbd5aa345b /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S | |
| parent | 70d0a630700f602a457832383161d261fe222db5 (diff) | |
| parent | 48b42dde17d79a0effc9ba85110aef2172e3e641 (diff) | |
Merge remote branch 'origin/master' into fedora/master
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 | 6 |
1 files changed, 5 insertions, 1 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 be14fc897e..e6535fb9a7 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 @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2005, 2007, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2002-2005, 2007, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -144,6 +144,10 @@ __pthread_cond_timedwait: movq %r9, 24(%rsp) movl %edx, 4(%rsp) + cmpq $0, (%r13) + movq $-ETIMEDOUT, %r14 + js 36f + 38: movl cond_futex(%rdi), %r12d /* Unlock. */ |