diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-01-06 09:23:26 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-01-06 09:23:26 +0000 |
| commit | dd486f53ee367e1667c61ec1fffdb59f9a8130e9 (patch) | |
| tree | 6e85e00b5a067e5717c98dcadbcc6303118ffad7 /nptl/sysdeps/unix/sysv/linux/x86_64 | |
| parent | 04c414477bd220f2c842453314a6dbb928e3c9e6 (diff) | |
| download | glibc-dd486f53ee367e1667c61ec1fffdb59f9a8130e9.tar.gz glibc-dd486f53ee367e1667c61ec1fffdb59f9a8130e9.tar.xz glibc-dd486f53ee367e1667c61ec1fffdb59f9a8130e9.zip | |
Updated to fedora-glibc-20060106T0916 cvs/fedora-glibc-2_3_90-28
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/x86_64')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h index 40c2518af6..ebcfe6eef1 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -47,16 +47,31 @@ #define lll_futex_wait(futex, val) \ - do { \ - int __ignore; \ + ({ \ + int __status; \ register __typeof (val) _val asm ("edx") = (val); \ __asm __volatile ("xorq %%r10, %%r10\n\t" \ "syscall" \ - : "=a" (__ignore) \ + : "=a" (__status) \ : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAIT), \ "d" (_val) \ : "memory", "cc", "r10", "r11", "cx"); \ - } while (0) + __status; \ + }) + + +#define lll_futex_timed_wait(futex, val, timeout) \ + ({ \ + register const struct timespec *__to __asm__ ("r10") = timeout; \ + int __status; \ + register __typeof (val) _val asm ("edx") = (val); \ + __asm __volatile ("syscall" \ + : "=a" (__status) \ + : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAIT), \ + "d" (_val), "r" (__to) \ + : "memory", "cc", "r11", "cx"); \ + __status; \ + }) #define lll_futex_wake(futex, nr) \ |