summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2001-02-02 07:30:22 +0000
committermrg <mrg@NetBSD.org>2001-02-02 07:30:22 +0000
commitd4dfeaf200e87f2db3924e8f5b2e428184c0ea46 (patch)
tree491c29cd7b72679441a75968591d78c020947ba3
parent2f62d51a64efb56cd7c08f1459a29563c57ff908 (diff)
add sunos32 support.
-rw-r--r--sys/kern/exec_conf.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c
index da069f6c68f..dc9d62d0757 100644
--- a/sys/kern/exec_conf.c
+++ b/sys/kern/exec_conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_conf.c,v 1.52 2000/12/17 21:36:49 jdolecek Exp $ */
+/* $NetBSD: exec_conf.c,v 1.53 2001/02/02 07:30:22 mrg Exp $ */
/*
* Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -114,6 +114,9 @@ int ELF64NAME2(netbsd,probe)(struct proc *, struct exec_package *,
#ifdef COMPAT_NETBSD32
#include <compat/netbsd32/netbsd32_exec.h>
+#ifdef COMPAT_SUNOS
+#include <compat/sunos32/sunos32_exec.h>
+#endif
#endif
#ifdef COMPAT_VAX1K
@@ -257,10 +260,16 @@ const struct execsw execsw_builtin[] = {
elf64_copyargs, setregs }, /* NetBSD 64bit ELF bins */
#endif /* EXEC_ELF64 */
#ifdef COMPAT_SUNOS
+#ifdef COMPAT_NETBSD32
+ { SUNOS32_AOUT_HDR_SIZE, exec_sunos32_aout_makecmds, { NULL },
+ &emul_sunos, EXECSW_PRIO_ANY,
+ 0, netbsd32_copyargs, netbsd32_setregs }, /* SunOS a.out, 64-bit kernel */
+#else
{ SUNOS_AOUT_HDR_SIZE, exec_sunos_aout_makecmds, { NULL },
&emul_sunos, EXECSW_PRIO_ANY,
0, copyargs, setregs }, /* SunOS a.out */
#endif
+#endif
#if defined(COMPAT_LINUX) && defined(EXEC_AOUT)
{ LINUX_AOUT_HDR_SIZE, exec_linux_aout_makecmds, { NULL },
&emul_linux, EXECSW_PRIO_ANY,