From 685e40bb09f5f24a2af54ea09c97328808f76990 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 19 Mar 2011 21:36:10 -0400 Subject: 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. --- src/thread/pthread_create.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/thread/pthread_create.c') diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index fccfa191..3716f75a 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -32,7 +32,7 @@ void __pthread_unwind_next(struct __ptcb *cb) exit(0); if (self->detached && self->map_base) { - syscall4(__NR_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8); + syscall(__NR_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8); __unmapself(self->map_base, self->map_size); } @@ -91,7 +91,7 @@ static void rsyscall_handler(int sig, siginfo_t *si, void *ctx) return; } - if (__syscall(rs.nr, rs.arg[0], rs.arg[1], rs.arg[2], + if (syscall(rs.nr, rs.arg[0], rs.arg[1], rs.arg[2], rs.arg[3], rs.arg[4], rs.arg[5]) < 0 && !rs.err) rs.err=errno; a_inc(&rs.cnt); @@ -140,7 +140,7 @@ static int rsyscall(int nr, long a, long b, long c, long d, long e, long f) while((i=rs.cnt)) __wait(&rs.cnt, 0, i, 1); if (rs.err) errno = rs.err, ret = -1; - else ret = __syscall(nr, a, b, c, d, e, f); + else ret = syscall(nr, a, b, c, d, e, f); UNLOCK(&rs.lock); return ret; -- cgit v1.2.1