Mon Nov 24 11:19:53 2008 UTC ()
COMPAT_ULTRIX does not work on vax because there are no hooks, but make
it compile anyway.


(ad)
diff -r1.2 -r1.3 src/sys/compat/ultrix/ultrix_mod.c
cvs diff -r1.2 -r1.3 src/sys/compat/ultrix/ultrix_mod.c (expand / switch to unified diff)

--- src/sys/compat/ultrix/ultrix_mod.c 2008/11/20 00:28:07 1.2
+++ src/sys/compat/ultrix/ultrix_mod.c 2008/11/24 11:19:53 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ultrix_mod.c,v 1.2 2008/11/20 00:28:07 cegger Exp $ */ 1/* $NetBSD: ultrix_mod.c,v 1.3 2008/11/24 11:19:53 ad Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 2008 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software developed for The NetBSD Foundation 7 * This code is derived from software developed for The NetBSD Foundation
8 * by Andrew Doran. 8 * by Andrew Doran.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -24,50 +24,60 @@ @@ -24,50 +24,60 @@
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#ifdef _KERNEL_OPT 32#ifdef _KERNEL_OPT
33#include "opt_execfmt.h" 33#include "opt_execfmt.h"
34#endif 34#endif
35 35
36#include <sys/cdefs.h> 36#include <sys/cdefs.h>
37__KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c,v 1.2 2008/11/20 00:28:07 cegger Exp $"); 37__KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c,v 1.3 2008/11/24 11:19:53 ad Exp $");
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/module.h> 40#include <sys/module.h>
41#include <sys/exec.h> 41#include <sys/exec.h>
 42#include <sys/signalvar.h>
42#include <sys/exec_elf.h> 43#include <sys/exec_elf.h>
 44#ifdef EXEC_ECOFF
43#include <sys/exec_ecoff.h> 45#include <sys/exec_ecoff.h>
44#include <sys/signalvar.h> 46#endif
45 47
46#include <compat/ultrix/ultrix_exec.h> 48#include <compat/ultrix/ultrix_exec.h>
47 49
48MODULE(MODULE_CLASS_MISC, compat_ultrix, "compat,exec_ecoff"); 50#ifdef EXEC_ECOFF
 51#define MD1 ",exec_ecoff"
 52#else
 53#define MD1 ""
 54#endif
 55
 56MODULE(MODULE_CLASS_MISC, compat_ultrix, "compat" MD1);
49 57
50static struct execsw ultrix_execsw[] = { 58static struct execsw ultrix_execsw[] = {
 59#ifdef EXEC_ECOFF
51 { ECOFF_HDR_SIZE, 60 { ECOFF_HDR_SIZE,
52 exec_ecoff_makecmds, 61 exec_ecoff_makecmds,
53 { .ecoff_probe_func = ultrix_exec_ecoff_probe }, 62 { .ecoff_probe_func = ultrix_exec_ecoff_probe },
54 &emul_ultrix, 63 &emul_ultrix,
55 EXECSW_PRIO_LAST, /* XXX probe func alw. succeeds */ 64 EXECSW_PRIO_LAST, /* XXX probe func alw. succeeds */
56 0, 65 0,
57 copyargs, 66 copyargs,
58 cpu_exec_ecoff_setregs, 67 cpu_exec_ecoff_setregs,
59 coredump_netbsd, 68 coredump_netbsd,
60 exec_setup_stack }, 69 exec_setup_stack },
 70#endif
61}; 71};
62 72
63static int 73static int
64compat_ultrix_modcmd(modcmd_t cmd, void *arg) 74compat_ultrix_modcmd(modcmd_t cmd, void *arg)
65{ 75{
66 76
67 switch (cmd) { 77 switch (cmd) {
68 case MODULE_CMD_INIT: 78 case MODULE_CMD_INIT:
69 return exec_add(ultrix_execsw, 79 return exec_add(ultrix_execsw,
70 __arraycount(ultrix_execsw)); 80 __arraycount(ultrix_execsw));
71 81
72 case MODULE_CMD_FINI: 82 case MODULE_CMD_FINI:
73 return exec_remove(ultrix_execsw, 83 return exec_remove(ultrix_execsw,