diff options
Diffstat (limited to 'lib/csu')
| -rw-r--r-- | lib/csu/common.h | 20 | ||||
| -rw-r--r-- | lib/csu/i386/crt0.c | 6 | ||||
| -rw-r--r-- | lib/csu/m68k/crt0.c | 6 | ||||
| -rw-r--r-- | lib/csu/vax/crt0.c | 6 |
4 files changed, 19 insertions, 19 deletions
diff --git a/lib/csu/common.h b/lib/csu/common.h index fbde48343c8..596b7cff5e7 100644 --- a/lib/csu/common.h +++ b/lib/csu/common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: common.h,v 1.5 2002/09/17 12:53:44 mickey Exp $ */ +/* $OpenBSD: common.h,v 1.6 2002/09/17 21:16:01 deraadt Exp $ */ /* $NetBSD: common.h,v 1.3 1995/06/15 21:41:48 pk Exp $ */ /* @@ -52,7 +52,7 @@ extern struct _dynamic _DYNAMIC; static void __load_rtld(struct _dynamic *); -extern int __syscall2(int, ...); +extern int __syscall(int, ...); int _callmain(void); static char *_strrchr(char *, char); #ifdef DEBUG @@ -65,15 +65,15 @@ static int _strncmp(char *, char *, int); /* * We need these system calls, but can't use library stubs */ -#define _exit(v) __syscall2(SYS_exit, (v)) -#define open(name, f, m) __syscall2(SYS_open, (name), (f), (m)) -#define close(fd) __syscall2(SYS_close, (fd)) -#define read(fd, s, n) __syscall2(SYS_read, (fd), (s), (n)) -#define write(fd, s, n) __syscall2(SYS_write, (fd), (s), (n)) -#define dup(fd) __syscall2(SYS_dup, (fd)) -#define dup2(fd, fdnew) __syscall2(SYS_dup2, (fd), (fdnew)) +#define _exit(v) __syscall(SYS_exit, (v)) +#define open(name, f, m) __syscall(SYS_open, (name), (f), (m)) +#define close(fd) __syscall(SYS_close, (fd)) +#define read(fd, s, n) __syscall(SYS_read, (fd), (s), (n)) +#define write(fd, s, n) __syscall(SYS_write, (fd), (s), (n)) +#define dup(fd) __syscall(SYS_dup, (fd)) +#define dup2(fd, fdnew) __syscall(SYS_dup2, (fd), (fdnew)) #define mmap(addr, len, prot, flags, fd, off) \ - __syscall2(SYS___syscall, (quad_t)SYS_mmap, (addr), (len), (prot), (flags), \ + __syscall(SYS___syscall, (quad_t)SYS_mmap, (addr), (len), (prot), (flags), \ (fd), 0, (off_t)(off)) #define _FATAL(str) \ diff --git a/lib/csu/i386/crt0.c b/lib/csu/i386/crt0.c index d3408768d6d..19390e7c840 100644 --- a/lib/csu/i386/crt0.c +++ b/lib/csu/i386/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.7 2002/09/17 12:53:44 mickey Exp $ */ +/* $OpenBSD: crt0.c,v 1.8 2002/09/17 21:16:01 deraadt Exp $ */ /* $NetBSD: crt0.c,v 1.20 1995/06/03 13:16:08 pk Exp $ */ /* @@ -34,7 +34,7 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crt0.c,v 1.7 2002/09/17 12:53:44 mickey Exp $"; +static char rcsid[] = "$OpenBSD: crt0.c,v 1.8 2002/09/17 21:16:01 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -98,7 +98,7 @@ asm ("__callmain:"); /* Defined for the benefit of debuggers */ } #ifdef DYNAMIC - asm(" ___syscall2:"); + asm(" ___syscall:"); asm(" popl %ecx"); asm(" popl %eax"); asm(" pushl %ecx"); diff --git a/lib/csu/m68k/crt0.c b/lib/csu/m68k/crt0.c index 8cb885e162e..9484cf5e7cf 100644 --- a/lib/csu/m68k/crt0.c +++ b/lib/csu/m68k/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.6 2002/09/17 12:53:44 mickey Exp $ */ +/* $OpenBSD: crt0.c,v 1.7 2002/09/17 21:16:01 deraadt Exp $ */ /* $NetBSD: crt0.c,v 1.14 1995/06/03 13:16:11 pk Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crt0.c,v 1.6 2002/09/17 12:53:44 mickey Exp $"; +static char rcsid[] = "$OpenBSD: crt0.c,v 1.7 2002/09/17 21:16:01 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -95,7 +95,7 @@ asm ("__callmain:"); /* Defined for the benefit of debuggers */ } #ifdef DYNAMIC - asm(" ___syscall2:"); + asm(" ___syscall:"); asm(" movel a7@+,a0"); /* return address */ asm(" movel a7@,d0"); /* syscall number */ asm(" movel a0,a7@"); diff --git a/lib/csu/vax/crt0.c b/lib/csu/vax/crt0.c index b9bbbc05f43..9881dbb69f2 100644 --- a/lib/csu/vax/crt0.c +++ b/lib/csu/vax/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.6 2002/09/17 12:53:44 mickey Exp $ */ +/* $OpenBSD: crt0.c,v 1.7 2002/09/17 21:16:01 deraadt Exp $ */ /* $NetBSD: crt0.c,v 1.1.2.1 1995/10/15 19:40:04 ragge Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crt0.c,v 1.6 2002/09/17 12:53:44 mickey Exp $"; +static char rcsid[] = "$OpenBSD: crt0.c,v 1.7 2002/09/17 21:16:01 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -96,7 +96,7 @@ asm ("__callmain:"); /* Defined for the benefit of debuggers */ } #ifdef DYNAMIC - asm(" ___syscall2:"); + asm(" ___syscall:"); asm(" .word 0"); /* no registers to save */ asm(" movl 4(ap), r0"); /* get syscall number */ asm(" subl3 $1,(ap)+,(ap)"); /* n-1 args to syscall */ |