diff options
| author |   deraadt <deraadt@openbsd.org> | 1996-12-23 02:42:22 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1996-12-23 02:42:22 +0000 |
| commit | a398dccb526cb5e3d7d355b866168fa6717962fe (patch) | |
| tree | d8a7eda8278953debcb543f4e475588f1841866e /sys/kern/exec_elf.c | |
| parent | Import of Openfirmware device drivers for PowerPC port. (diff) | |
| download | wireguard-openbsd-a398dccb526cb5e3d7d355b866168fa6717962fe.tar.xz wireguard-openbsd-a398dccb526cb5e3d7d355b866168fa6717962fe.zip | |
use _{NLIST,KERN}_DO_{AOUT,ELF,ECOFF} to select binary types
Diffstat (limited to 'sys/kern/exec_elf.c')
| -rw-r--r-- | sys/kern/exec_elf.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c index 053fdf9cb0a..649a062acc3 100644 --- a/sys/kern/exec_elf.c +++ b/sys/kern/exec_elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_elf.c,v 1.18 1996/11/24 18:31:25 etheisen Exp $ */ +/* $OpenBSD: exec_elf.c,v 1.19 1996/12/23 02:42:43 deraadt Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -40,6 +40,9 @@ #include <sys/namei.h> #include <sys/vnode.h> #include <sys/exec.h> + +#if defined(_KERN_DO_ELF) + #include <sys/exec_elf.h> #include <sys/exec_olf.h> #include <sys/file.h> @@ -47,13 +50,6 @@ #include <sys/signalvar.h> #include <sys/stat.h> -#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4) /*XXX should be */ -#undef EXEC_ELF /*XXX defined in */ -#define EXEC_ELF /*XXX machine/exec.h */ -#endif /*XXX instead ? */ - -#if defined(NATIVE_EXEC_ELF) || defined(EXEC_ELF) - #include <sys/mman.h> #include <vm/vm.h> #include <vm/vm_param.h> @@ -616,7 +612,7 @@ exec_elf_makecmds(p, epp) free((char *) ph, M_TEMP); epp->ep_vp->v_flag |= VTEXT; - return exec_aout_setup_stack(p, epp); + return exec_setup_stack(p, epp); bad: free((char *) ph, M_TEMP); @@ -708,4 +704,4 @@ exec_elf_fixup(p, epp) free((char *) interp, M_TEMP); return error; } -#endif /* NATIVE_EXEC_ELF || EXEC_ELF */ +#endif /* _KERN_DO_ELF */ |