[src/trunk]: src/sys make COMPAT_OSF1 to compile. not tested (could someone ...

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

details:   https://anonhg.NetBSD.org/src/rev/4e19ac188f08
branches:  trunk
changeset: 499539:4e19ac188f08
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Nov 22 03:48:33 2000 +0000

description:
make COMPAT_OSF1 to compile.  not tested (could someone review?).

diffstat:

 sys/compat/osf1/osf1_exec.c |   7 ++-----
 sys/compat/osf1/osf1_exec.h |   4 +++-
 sys/kern/exec_conf.c        |  10 +++++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diffs (85 lines):

diff -r 81eca94c7402 -r 4e19ac188f08 sys/compat/osf1/osf1_exec.c
--- a/sys/compat/osf1/osf1_exec.c       Wed Nov 22 02:25:52 2000 +0000
+++ b/sys/compat/osf1/osf1_exec.c       Wed Nov 22 03:48:33 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_exec.c,v 1.12 2000/11/21 00:37:54 jdolecek Exp $ */
+/* $NetBSD: osf1_exec.c,v 1.13 2000/11/22 03:48:33 itojun Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -57,9 +57,6 @@
        char    loader_name[MAXPATHLEN+1];
 };
 
-static void *osf1_copyargs(struct exec_package *pack,
-    struct ps_strings *arginfo, void *stack, void *argp);
-
 static int osf1_exec_ecoff_dynamic(struct proc *p, struct exec_package *epp);
 
 extern struct sysent osf1_sysent[];
@@ -138,7 +135,7 @@
  * copy arguments onto the stack in the normal way, then copy out
  * any ELF-like AUX entries used by the dynamic loading scheme.
  */
-static void *
+void *
 osf1_copyargs(pack, arginfo, stack, argp)
        struct exec_package *pack;
        struct ps_strings *arginfo;
diff -r 81eca94c7402 -r 4e19ac188f08 sys/compat/osf1/osf1_exec.h
--- a/sys/compat/osf1/osf1_exec.h       Wed Nov 22 02:25:52 2000 +0000
+++ b/sys/compat/osf1/osf1_exec.h       Wed Nov 22 03:48:33 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_exec.h,v 1.1 2000/11/21 00:37:54 jdolecek Exp $ */
+/* $NetBSD: osf1_exec.h,v 1.2 2000/11/22 03:48:33 itojun Exp $ */
 
 /*
  * Copyright (c) 2000 The NetBSD foundation, Inc.
@@ -37,5 +37,7 @@
 
 void cpu_exec_ecoff_setregs __P((struct proc *, struct exec_package *, u_long));
 int osf1_exec_ecoff_probe __P((struct proc *, struct exec_package *));
+void *osf1_copyargs(struct exec_package *pack,
+    struct ps_strings *arginfo, void *stack, void *argp);
 
 #endif /* OSF1_EXEC_H */
diff -r 81eca94c7402 -r 4e19ac188f08 sys/kern/exec_conf.c
--- a/sys/kern/exec_conf.c      Wed Nov 22 02:25:52 2000 +0000
+++ b/sys/kern/exec_conf.c      Wed Nov 22 03:48:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_conf.c,v 1.44 2000/11/21 00:37:55 jdolecek Exp $  */
+/*     $NetBSD: exec_conf.c,v 1.45 2000/11/22 03:48:34 itojun Exp $    */
 
 /*
  * Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -124,6 +124,7 @@
 #endif
 
 #ifdef COMPAT_OSF1
+#include <compat/osf1/osf1.h>
 #include <compat/osf1/osf1_exec.h>
 #endif
 
@@ -132,9 +133,12 @@
 #endif
 
 extern const struct emul emul_netbsd;
-# ifdef COMPAT_AOUT
+#ifdef COMPAT_AOUT
 extern const struct emul emul_netbsd_aout;
 #endif
+#ifdef COMPAT_OSF1
+extern const struct emul emul_osf1;
+#endif
 
 const struct execsw execsw[] = {
 #ifdef EXEC_SCRIPT
@@ -167,7 +171,7 @@
          &emul_osf1, 0,
          howmany(OSF1_MAX_AUX_ENTRIES * sizeof (struct osf1_auxv) +
            2 * (MAXPATHLEN + 1), sizeof (char *)), /* exec & loader names */
-         0, osf1_copyargs, cpu_exec_ecoff_setregs }, /* OSF1 ecoff binaries */
+         osf1_copyargs, cpu_exec_ecoff_setregs }, /* OSF1 ecoff binaries */
 #endif /* COMPAT_OSF1 */
        { ECOFF_HDR_SIZE, exec_ecoff_makecmds,
          { ecoff_probe_func: cpu_exec_ecoff_probe },