diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 5 | ||||
| -rw-r--r-- | sys/arch/i386/i386/trap.c | 11 |
2 files changed, 3 insertions, 13 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 5755aee064f..993d42a0cd1 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.210 2012/05/27 12:24:33 jsg Exp $ +# $OpenBSD: files.i386,v 1.211 2012/09/06 20:20:30 tedu Exp $ # # new style config file for i386 architecture # @@ -270,9 +270,6 @@ file arch/i386/i386/vm86.c vm86 file arch/i386/i386/kvm86.c kvm86 file arch/i386/i386/kvm86call.S kvm86 -# a.out binary compatibility (COMPAT_AOUT) -include "compat/aout/files.aout" - # Linux binary compatibility (COMPAT_LINUX) include "compat/linux/files.linux" file arch/i386/i386/linux_machdep.c compat_linux diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c index db4d6b73b67..89a1f6eca98 100644 --- a/sys/arch/i386/i386/trap.c +++ b/sys/arch/i386/i386/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.103 2012/08/07 05:16:53 guenther Exp $ */ +/* $OpenBSD: trap.c,v 1.104 2012/09/06 20:20:30 tedu Exp $ */ /* $NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $ */ /*- @@ -71,9 +71,6 @@ #include <compat/linux/linux_syscall.h> extern struct emul emul_linux_aout, emul_linux_elf; #endif -#ifdef COMPAT_AOUT -extern struct emul emul_aout; -#endif #ifdef KVM86 #include <machine/kvm86.h> #define KVM86MODE (kvm86_incall) @@ -588,11 +585,7 @@ syscall(struct trapframe *frame) * Like syscall, but code is a quad, so as to maintain * quad alignment for the rest of the arguments. */ - if (callp != sysent -#ifdef COMPAT_AOUT - && p->p_emul != &emul_aout -#endif - ) + if (callp != sysent) break; copyin(params + _QUAD_LOWWORD * sizeof(int), &code, sizeof(int)); params += sizeof(quad_t); |