diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-03-19 21:36:10 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-03-19 21:36:10 -0400 |
| commit | 685e40bb09f5f24a2af54ea09c97328808f76990 (patch) | |
| tree | 73bbf60045bb3a9c8af4f2639e8adb2ad1ea6994 /src/thread/__wait.c | |
| parent | 462dbfc20788a6c9dd1ea4bb1cef086aa189615a (diff) | |
| download | musl-685e40bb09f5f24a2af54ea09c97328808f76990.tar.gz | |
syscall overhaul part two - unify public and internal syscall interface
with this patch, the syscallN() functions are no longer needed; a
variadic syscall() macro allows syscalls with anywhere from 0 to 6
arguments to be made with a single macro name. also, manually casting
each non-integer argument with (long) is no longer necessary; the
casts are hidden in the macros.
some source files which depended on being able to define the old macro
SYSCALL_RETURNS_ERRNO have been modified to directly use __syscall()
instead of syscall(). references to SYSCALL_SIGSET_SIZE and SYSCALL_LL
have also been changed.
x86_64 has not been tested, and may need a follow-up commit to fix any
minor bugs/oversights.
Diffstat (limited to 'src/thread/__wait.c')
| -rw-r--r-- | src/thread/__wait.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/thread/__wait.c b/src/thread/__wait.c index 8c249cd3..b0969bb2 100644 --- a/src/thread/__wait.c +++ b/src/thread/__wait.c @@ -1,4 +1,3 @@ -#define SYSCALL_RETURN_ERRNO #include "pthread_impl.h" void __wait(volatile int *addr, volatile int *waiters, int val, int priv) @@ -11,6 +10,6 @@ void __wait(volatile int *addr, volatile int *waiters, int val, int priv) } if (waiters) a_inc(waiters); while (*addr==val) - syscall4(__NR_futex, (long)addr, FUTEX_WAIT|priv, val, 0); + __syscall(__NR_futex, (long)addr, FUTEX_WAIT|priv, val, 0); if (waiters) a_dec(waiters); } |