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/i386/i486/lowlevellock.S | |
| parent | 70d0a630700f602a457832383161d261fe222db5 (diff) | |
| parent | 48b42dde17d79a0effc9ba85110aef2172e3e641 (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S index 7578c7ece0..2198ccf55a 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2004, 2006, 2007, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2002-2004,2006,2007,2009,2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -188,6 +188,9 @@ __lll_timedlock_wait: je .Lreltmo # endif + cmpl $0, (%edx) + js 8f + movl %ecx, %ebx movl %esi, %ecx movl %edx, %esi @@ -223,6 +226,9 @@ __lll_timedlock_wait: cfi_restore(%ebp) ret +8: movl $ETIMEDOUT, %eax + jmp 7b + # ifndef __ASSUME_FUTEX_CLOCK_REALTIME .Lreltmo: /* Check for a valid timeout value. */ |