[src/trunk]: src/sys/compat/common COMPAT_16 code only exists on amd64 in the...

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

details:   https://anonhg.NetBSD.org/src/rev/81331587020d
branches:  trunk
changeset: 768106:81331587020d
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Aug 08 23:44:06 2011 +0000

description:
COMPAT_16 code only exists on amd64 in the presence of COMPAT_NETBSD32.

diffstat:

 sys/compat/common/compat_mod.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (74 lines):

diff -r bf33331d529c -r 81331587020d sys/compat/common/compat_mod.c
--- a/sys/compat/common/compat_mod.c    Mon Aug 08 23:18:36 2011 +0000
+++ b/sys/compat/common/compat_mod.c    Mon Aug 08 23:44:06 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_mod.c,v 1.13 2011/03/06 17:08:33 bouyer Exp $   */
+/*     $NetBSD: compat_mod.c,v 1.14 2011/08/08 23:44:06 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.13 2011/03/06 17:08:33 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.14 2011/08/08 23:44:06 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -63,9 +63,11 @@
 int    ttcompat(struct tty *, u_long, void *, int, struct lwp *);
 
 #ifdef COMPAT_16
+#if !(defined(__amd64__) && !defined(COMPAT_NETBSD32))
 extern char sigcode[], esigcode[];
 struct uvm_object *emul_netbsd_object;
 #endif
+#endif
 
 extern krwlock_t exec_lock;
 extern krwlock_t ttcompat_lock;
@@ -157,9 +159,11 @@
 #endif
 
 #if defined(COMPAT_16)
+#if !(defined(__amd64__) && !defined(COMPAT_NETBSD32))
        { SYS_compat_16___sigaction14, 0, (sy_call_t *)compat_16_sys___sigaction14 },
        { SYS_compat_16___sigreturn14, 0, (sy_call_t *)compat_16_sys___sigreturn14 },
 #endif
+#endif
 
 #if defined(COMPAT_20)
        { SYS_compat_20_fhstatfs, 0, (sy_call_t *)compat_20_sys_fhstatfs },
@@ -254,6 +258,7 @@
                ttcompatvec = ttcompat;
 #endif
 #ifdef COMPAT_16
+#if !(defined(__amd64__) && !defined(COMPAT_NETBSD32))
                KASSERT(emul_netbsd.e_sigobject == NULL);
                rw_enter(&exec_lock, RW_WRITER);
                emul_netbsd.e_sigcode = sigcode;
@@ -263,6 +268,7 @@
                KASSERT(sendsig_sigcontext_vec == NULL);
                sendsig_sigcontext_vec = sendsig_sigcontext;
 #endif
+#endif
 #if defined(COMPAT_09) || defined(COMPAT_43)
                compat_sysctl_init();
 #endif
@@ -305,6 +311,7 @@
                }
 #endif
 #ifdef COMPAT_16
+#if !(defined(__amd64__) && !defined(COMPAT_NETBSD32))
                /*
                 * The sigobject may persist if still in use, but
                 * is reference counted so will die eventually.
@@ -319,6 +326,7 @@
                emul_netbsd.e_esigcode = NULL;
                emul_netbsd.e_sigobject = NULL;
                rw_exit(&exec_lock);
+#endif
 #endif /* COMPAT_16 */
 #if defined(COMPAT_09) || defined(COMPAT_43)
                compat_sysctl_fini();