Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
itojun 2000-11-22 03:48:33 +00:00
parent 7231516137
commit 6c7e531e99
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/compat/osf1/osf1_exec.c
View File

@ -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. * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@ -57,9 +57,6 @@ struct osf1_exec_emul_arg {
char loader_name[MAXPATHLEN+1]; 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); static int osf1_exec_ecoff_dynamic(struct proc *p, struct exec_package *epp);
extern struct sysent osf1_sysent[]; extern struct sysent osf1_sysent[];
@ -138,7 +135,7 @@ osf1_exec_ecoff_probe(struct proc *p, struct exec_package *epp)
* copy arguments onto the stack in the normal way, then copy out * copy arguments onto the stack in the normal way, then copy out
* any ELF-like AUX entries used by the dynamic loading scheme. * any ELF-like AUX entries used by the dynamic loading scheme.
*/ */
static void * void *
osf1_copyargs(pack, arginfo, stack, argp) osf1_copyargs(pack, arginfo, stack, argp)
struct exec_package *pack; struct exec_package *pack;
struct ps_strings *arginfo; struct ps_strings *arginfo;

4
sys/compat/osf1/osf1_exec.h
View File

@ -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. * Copyright (c) 2000 The NetBSD foundation, Inc.
@ -37,5 +37,7 @@
void cpu_exec_ecoff_setregs __P((struct proc *, struct exec_package *, u_long)); void cpu_exec_ecoff_setregs __P((struct proc *, struct exec_package *, u_long));
int osf1_exec_ecoff_probe __P((struct proc *, struct exec_package *)); 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 */ #endif /* OSF1_EXEC_H */

10
sys/kern/exec_conf.c
View File

@ -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 * Copyright (c) 1993, 1994 Christopher G. Demetriou
@ -124,6 +124,7 @@ int ELF64NAME2(netbsd,probe)(struct proc *, struct exec_package *,
#endif #endif
#ifdef COMPAT_OSF1 #ifdef COMPAT_OSF1
#include <compat/osf1/osf1.h>
#include <compat/osf1/osf1_exec.h> #include <compat/osf1/osf1_exec.h>
#endif #endif
@ -132,9 +133,12 @@ int ELF64NAME2(netbsd,probe)(struct proc *, struct exec_package *,
#endif #endif
extern const struct emul emul_netbsd; extern const struct emul emul_netbsd;
# ifdef COMPAT_AOUT #ifdef COMPAT_AOUT
extern const struct emul emul_netbsd_aout; extern const struct emul emul_netbsd_aout;
#endif #endif
#ifdef COMPAT_OSF1
extern const struct emul emul_osf1;
#endif
const struct execsw execsw[] = { const struct execsw execsw[] = {
#ifdef EXEC_SCRIPT #ifdef EXEC_SCRIPT
@ -167,7 +171,7 @@ const struct execsw execsw[] = {
&emul_osf1, 0, &emul_osf1, 0,
howmany(OSF1_MAX_AUX_ENTRIES * sizeof (struct osf1_auxv) + howmany(OSF1_MAX_AUX_ENTRIES * sizeof (struct osf1_auxv) +
2 * (MAXPATHLEN + 1), sizeof (char *)), /* exec & loader names */ 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 */ #endif /* COMPAT_OSF1 */
{ ECOFF_HDR_SIZE, exec_ecoff_makecmds, { ECOFF_HDR_SIZE, exec_ecoff_makecmds,
{ ecoff_probe_func: cpu_exec_ecoff_probe }, { ecoff_probe_func: cpu_exec_ecoff_probe },