[src/trunk]: src/sys/kern we don't need sigreturn and sigcode glue if we are ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/33404c184187
branches:  trunk
changeset: 551699:33404c184187
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Sep 10 16:43:34 2003 +0000

description:
we don't need sigreturn and sigcode glue if we are not compat_16 anymore.

diffstat:

 sys/kern/kern_exec.c     |  16 ++++++++++++----
 sys/kern/syscalls.conf   |   4 ++--
 sys/kern/syscalls.master |   6 +++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diffs (93 lines):

diff -r 8e75c56b342b -r 33404c184187 sys/kern/kern_exec.c
--- a/sys/kern/kern_exec.c      Wed Sep 10 16:41:26 2003 +0000
+++ b/sys/kern/kern_exec.c      Wed Sep 10 16:43:34 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_exec.c,v 1.172 2003/08/29 13:29:32 enami Exp $    */
+/*     $NetBSD: kern_exec.c,v 1.173 2003/09/10 16:43:35 christos Exp $ */
 
 /*-
  * Copyright (C) 1993, 1994, 1996 Christopher G. Demetriou
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.172 2003/08/29 13:29:32 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.173 2003/09/10 16:43:35 christos Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_syscall_debug.h"
@@ -120,8 +120,6 @@
 };
 #endif /* LKM */
 
-/* NetBSD emul struct */
-extern char    sigcode[], esigcode[];
 #ifdef SYSCALL_DEBUG
 extern const char * const syscallnames[];
 #endif
@@ -131,8 +129,12 @@
 void syscall(void);
 #endif
 
+#if !defined(__HAVE_SIGINFO) || defined(COMPAT_16)
+extern char    sigcode[], esigcode[];
 struct uvm_object *emul_netbsd_object;
+#endif
 
+/* NetBSD emul struct */
 const struct emul emul_netbsd = {
        "netbsd",
        NULL,           /* emulation path */
@@ -150,9 +152,15 @@
 #endif
        sendsig,
        trapsignal,
+#if !defined(__HAVE_SIGINFO) || defined(COMPAT_16)
        sigcode,
        esigcode,
        &emul_netbsd_object,
+#else
+       NULL,
+       NULL,
+       NULL,
+#endif
        setregs,
        NULL,
        NULL,
diff -r 8e75c56b342b -r 33404c184187 sys/kern/syscalls.conf
--- a/sys/kern/syscalls.conf    Wed Sep 10 16:41:26 2003 +0000
+++ b/sys/kern/syscalls.conf    Wed Sep 10 16:43:34 2003 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: syscalls.conf,v 1.6 2000/12/09 06:15:42 mycroft Exp $
+#      $NetBSD: syscalls.conf,v 1.7 2003/09/10 16:43:34 christos Exp $
 
 sysnames="syscalls.c"
 sysnumhdr="../sys/syscall.h"
 syssw="init_sysent.c"
 sysarghdr="../sys/syscallargs.h"
-compatopts="compat_43 compat_09 compat_10 compat_11 compat_12 compat_13 compat_14"
+compatopts="compat_43 compat_09 compat_10 compat_11 compat_12 compat_13 compat_14 compat_15 compat_16"
 libcompatopts=""
 
 switchname="sysent"
diff -r 8e75c56b342b -r 33404c184187 sys/kern/syscalls.master
--- a/sys/kern/syscalls.master  Wed Sep 10 16:41:26 2003 +0000
+++ b/sys/kern/syscalls.master  Wed Sep 10 16:43:34 2003 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.128 2003/03/18 18:08:49 christos Exp $
+       $NetBSD: syscalls.master,v 1.129 2003/09/10 16:43:35 christos Exp $
 
 ;      @(#)syscalls.master     8.2 (Berkeley) 1/13/94
 
@@ -606,7 +606,11 @@
                            const sigset_t *set, \
                            sigset_t *oset); }
 294    STD             { int sys___sigsuspend14(const sigset_t *set); }
+#if defined(__HAVE_SIGINFO)
+295    COMPAT_16       { int sys___sigreturn14(struct sigcontext *sigcntxp); }
+#else
 295    STD             { int sys___sigreturn14(struct sigcontext *sigcntxp); }
+#endif
 296    STD             { int sys___getcwd(char *bufp, size_t length); }
 297    STD             { int sys_fchroot(int fd); }
 298    STD             { int sys_fhopen(const fhandle_t *fhp, int flags); }