diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_exit.c | 2 | ||||
| -rw-r--r-- | sys/kern/syscalls.conf | 1 | ||||
| -rw-r--r-- | sys/kern/syscalls.master | 2 | ||||
| -rw-r--r-- | sys/tools/syscalls/config.lua | 1 | ||||
| -rwxr-xr-x | sys/tools/syscalls/scripts/syscall_h.lua | 4 | ||||
| -rwxr-xr-x | sys/tools/syscalls/scripts/syscalls_map.lua | 2 |
6 files changed, 9 insertions, 3 deletions
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 54e3044ab093..a32b5a1b3354 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -202,7 +202,7 @@ exit_onexit(struct proc *p) * exit -- death of process. */ int -sys_exit(struct thread *td, struct exit_args *uap) +sys__exit(struct thread *td, struct _exit_args *uap) { exit1(td, uap->rval, 0); diff --git a/sys/kern/syscalls.conf b/sys/kern/syscalls.conf index a98d52659832..ae7bd1f87612 100644 --- a/sys/kern/syscalls.conf +++ b/sys/kern/syscalls.conf @@ -1,3 +1,4 @@ libsysmap="../../lib/libsys/syscalls.map" libsys_h="../../lib/libsys/_libsys.h" sysmk="../sys/syscall.mk" +syshdr_extra="#define SYS_exit SYS__exit" diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index a8815afee866..29f9d9dae390 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -125,7 +125,7 @@ ); } 1 AUE_EXIT STD|CAPENABLED { - void exit( + void _exit( int rval ); } diff --git a/sys/tools/syscalls/config.lua b/sys/tools/syscalls/config.lua index fcf4c2217959..91a8a5af68dd 100644 --- a/sys/tools/syscalls/config.lua +++ b/sys/tools/syscalls/config.lua @@ -24,6 +24,7 @@ local util = require("tools.util") local config = { sysnames = "syscalls.c", syshdr = "../sys/syscall.h", + syshdr_extra = nil; sysmk = "/dev/null", syssw = "init_sysent.c", systrace = "systrace_args.c", diff --git a/sys/tools/syscalls/scripts/syscall_h.lua b/sys/tools/syscalls/scripts/syscall_h.lua index 5f8d8fb66889..d05a1799935b 100755 --- a/sys/tools/syscalls/scripts/syscall_h.lua +++ b/sys/tools/syscalls/scripts/syscall_h.lua @@ -38,6 +38,10 @@ function syscall_h.generate(tbl, config, fh) -- Write the generated preamble. gen:preamble("System call numbers.") + if config.syshdr_extra then + gen:write(string.format("%s\n\n", config.syshdr_extra)) + end + for _, v in pairs(s) do local c = v:compatLevel() if v.num > max then diff --git a/sys/tools/syscalls/scripts/syscalls_map.lua b/sys/tools/syscalls/scripts/syscalls_map.lua index 52c3b294e338..dfd61ae75bc0 100755 --- a/sys/tools/syscalls/scripts/syscalls_map.lua +++ b/sys/tools/syscalls/scripts/syscalls_map.lua @@ -39,7 +39,7 @@ function syscalls_map.generate(tbl, config, fh) for _, v in pairs(s) do gen:write(v.prolog) if v:native() and not v.type.NODEF and not v.type.NOLIB then - if v.name ~= "exit" and v.name ~= "vfork" then + if v.name ~= "_exit" and v.name ~= "vfork" then gen:write(string.format("\t_%s;\n", v.name)) end gen:write(string.format("\t__sys_%s;\n", v.name)) |