diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-01-13 21:27:06 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-01-13 21:27:06 +0000 |
| commit | e9135ac4cf4c91cfee56c97acc82db98141f6077 (patch) | |
| tree | daff3e0dd7e25e239ce25e53fd9ac8410dd2ae5c /sys | |
| parent | 3da676cff927caba56aad47d7505d83e5f23f697 (diff) | |
Get rid of old MID binary compatibility. This has been a lifesaver back when
the toolchain was in limbo, but now that we have a solid enough in-tree
toolchain, this makes no sense. Plus the libc back then was full of bugs...
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mvme88k/include/param.h | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/machdep.c | 28 |
2 files changed, 3 insertions, 29 deletions
diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h index eb20fa85891..693c7cf4be1 100644 --- a/sys/arch/mvme88k/include/param.h +++ b/sys/arch/mvme88k/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.31 2003/10/08 19:10:05 miod Exp $ */ +/* $OpenBSD: param.h,v 1.32 2004/01/13 21:27:03 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1988 University of Utah. @@ -51,8 +51,6 @@ #define _MACHINE_ARCH m88k #define MACHINE_ARCH "m88k" #define MID_MACHINE MID_M88K -/* Older value for MID_MACHINE */ -#define OLD_MID_MACHINE 151 /* * Round p (pointer or byte index) down to a correctly-aligned value diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index c7ff28850b5..5954365ce2c 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.131 2004/01/13 17:15:08 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.132 2004/01/13 21:27:05 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -1836,32 +1836,8 @@ cpu_exec_aout_makecmds(p, epp) struct proc *p; struct exec_package *epp; { -#ifdef COMPAT_25 - /* - * Keep compatibility with older OpenBSD/mvme88k binaries - * for a while, to make transition easier. - */ - u_long midmag, magic; - u_short mid; - struct exec *execp = epp->ep_hdr; - - midmag = ntohl(execp->a_midmag); - mid = (midmag >> 16) & 0x3ff; - magic = midmag & 0xffff; - - midmag = mid << 16 | magic; - - switch (midmag) { - case (OLD_MID_MACHINE << 16) | ZMAGIC: - return exec_aout_prep_zmagic(p, epp); - case (OLD_MID_MACHINE << 16) | NMAGIC: - return exec_aout_prep_nmagic(p, epp); - case (OLD_MID_MACHINE << 16) | OMAGIC: - return exec_aout_prep_omagic(p, epp); - } -#endif - return ENOEXEC; + return (ENOEXEC); } int |