check emul flags for EMUL_HAS_SYS___syscall instead of comparing
callp to sysent; the COMPAT_AOUT hack is gone
This commit is contained in:
parent
d06ce6de86
commit
f3d1c08b2a
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: trap.c,v 1.96 2000/11/27 13:31:18 pk Exp $ */
|
||||
/* $NetBSD: trap.c,v 1.97 2000/12/01 19:50:17 jdolecek Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996
|
||||
@ -52,7 +52,6 @@
|
||||
#include "opt_ktrace.h"
|
||||
#include "opt_compat_svr4.h"
|
||||
#include "opt_compat_sunos.h"
|
||||
#include "opt_compat_aout.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -95,10 +94,6 @@ extern struct emul emul_sunos;
|
||||
#include <sparc/sparc/memreg.h>
|
||||
#include <sparc/sparc/cpuvar.h>
|
||||
|
||||
#ifdef COMPAT_AOUT
|
||||
extern struct emul emul_netbsd_aout;
|
||||
#endif /* COMPAT_AOUT */
|
||||
|
||||
#ifdef DEBUG
|
||||
int rwindow_debug = 0;
|
||||
#endif
|
||||
@ -1196,11 +1191,7 @@ syscall(code, tf, pc)
|
||||
nap--;
|
||||
break;
|
||||
case SYS___syscall:
|
||||
if (callp != sysent
|
||||
#ifdef COMPAT_AOUT
|
||||
&& p->p_emul != &emul_netbsd_aout /* Our a.out */
|
||||
#endif
|
||||
)
|
||||
if (!(p->p_emul->e_flags & EMUL_HAS_SYS___syscall))
|
||||
break;
|
||||
code = ap[_QUAD_LOWWORD];
|
||||
ap += 2;
|
||||
|
Loading…
Reference in New Issue
Block a user