From f7fa86b743f4851065b80a704e7ee6c9922b5bda Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 25 Oct 2002 19:10:58 +0000 Subject: Split 4.x and 5.x signal handling so that we can keep 4.x signal handling clean and functional as 5.x evolves. This allows some of the nasty bandaids in the 5.x codepaths to be unwound. Encapsulate 4.x signal handling under COMPAT_FREEBSD4 (there is an anti-foot-shooting measure in place, 5.x folks need this for a while) and finish encapsulating the older stuff under COMPAT_43. Since the ancient stuff is required on alpha (longjmp(3) passes a 'struct osigcontext *' to the current sigreturn(2), instead of the 'ucontext_t *' that sigreturn is supposed to take), add a compile time check to prevent foot shooting there too. Add uniform COMPAT_43 stubs for ia64/sparc64/powerpc. Tested on: i386, alpha, ia64. Compiled on sparc64 (a few days ago). Approved by: re --- sys/kern/syscalls.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/kern/syscalls.c') diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 142e8f2..3215b63 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -110,7 +110,7 @@ char *syscallnames[] = { "getpriority", /* 100 = getpriority */ "old.send", /* 101 = old send */ "old.recv", /* 102 = old recv */ - "osigreturn", /* 103 = osigreturn */ + "old.sigreturn", /* 103 = old sigreturn */ "bind", /* 104 = bind */ "setsockopt", /* 105 = setsockopt */ "listen", /* 106 = listen */ @@ -349,9 +349,9 @@ char *syscallnames[] = { "#339", /* 339 = pioctl */ "sigprocmask", /* 340 = sigprocmask */ "sigsuspend", /* 341 = sigsuspend */ - "sigaction", /* 342 = sigaction */ + "old.sigaction", /* 342 = old sigaction */ "sigpending", /* 343 = sigpending */ - "sigreturn", /* 344 = sigreturn */ + "old.sigreturn", /* 344 = old sigreturn */ "#345", /* 345 = sigtimedwait */ "#346", /* 346 = sigwaitinfo */ "__acl_get_file", /* 347 = __acl_get_file */ @@ -423,8 +423,8 @@ char *syscallnames[] = { "extattr_get_link", /* 413 = extattr_get_link */ "extattr_delete_link", /* 414 = extattr_delete_link */ "#415", /* 415 = __execve_mac */ - "#416", /* 416 = newsigreturn */ - "#417", /* 417 = newsigaction */ + "sigaction", /* 416 = sigaction */ + "sigreturn", /* 417 = sigreturn */ "#418", /* 418 = __xstat */ "#419", /* 419 = __xfstat */ "#420", /* 420 = __xlstat */ -- cgit v1.1