diff options
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 83 |
1 files changed, 2 insertions, 81 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index f880fec8953..9f4cabca211 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.46 1997/09/02 04:10:19 downsj Exp $ */ +/* $OpenBSD: machdep.c,v 1.47 1997/09/02 08:50:30 downsj Exp $ */ /* $NetBSD: machdep.c,v 1.202 1996/05/18 15:54:59 christos Exp $ */ /*- @@ -176,9 +176,6 @@ void dumpsys __P((void)); void identifycpu __P((void)); void init386 __P((vm_offset_t)); void consinit __P((void)); -#ifdef COMPAT_BSDOS -static int exec_bsdos __P((struct proc *, struct exec_package *)); -#endif int bus_mem_add_mapping __P((bus_addr_t, bus_size_t, int, bus_space_handle_t *)); @@ -1362,95 +1359,19 @@ _remque(v) elem->q_prev = 0; } -#ifdef COMPAT_BSDOS -static int -exec_bsdos(p, epp) - struct proc *p; - struct exec_package *epp; -{ - int error; - u_long midmag, magic; - u_short mid; - struct exec *execp = epp->ep_hdr; - - /* check on validity of epp->ep_hdr performed by exec_out_makecmds */ - - midmag = ntohl(execp->a_midmag); - mid = (midmag >> 16) & 0xffff; - magic = midmag & 0xffff; - - if (magic == 0) { - magic = (execp->a_midmag & 0xffff); - mid = MID_ZERO; - } - - midmag = mid << 16 | magic; - - switch (midmag) { - case (MID_ZERO << 16) | ZMAGIC: - /* - * 386BSD's ZMAGIC format: - */ - error = exec_aout_prep_oldzmagic(p, epp); - break; - - case (MID_ZERO << 16) | QMAGIC: - /* - * BSDI's QMAGIC format: - * same as new ZMAGIC format, but with different magic number - */ - error = exec_aout_prep_zmagic(p, epp); - break; - - case (MID_ZERO << 16) | NMAGIC: - /* - * BSDI's NMAGIC format: - * same as NMAGIC format, but with different magic number - * and with text starting at 0. - */ - error = exec_aout_prep_oldnmagic(p, epp); - break; - - case (MID_ZERO << 16) | OMAGIC: - /* - * BSDI's OMAGIC format: - * same as OMAGIC format, but with different magic number - * and with text starting at 0. - */ - error = exec_aout_prep_oldomagic(p, epp); - break; - - default: - error = ENOEXEC; - } - - return error; -} -#endif - /* * cpu_exec_aout_makecmds(): * cpu-dependent a.out format hook for execve(). * * Determine of the given exec package refers to something which we * understand and, if so, set up the vmcmds for it. - * - * On the i386, old (386bsd) ZMAGIC binaries and BSDI QMAGIC binaries - * if COMPAT_BSDOS is given as a kernel option. */ int cpu_exec_aout_makecmds(p, epp) struct proc *p; struct exec_package *epp; { - int error = ENOEXEC; - -#ifdef COMPAT_BSDOS - if ((error = exec_bsdos(p, epp)) == 0) - return error; -#endif /* ! COMPAT_BSDOS */ - - return error; + return ENOEXEC; } u_int |