diff options
Diffstat (limited to 'sys/arch/sparc/sparc/machdep.c')
| -rw-r--r-- | sys/arch/sparc/sparc/machdep.c | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c index 356e18ee2fa..dd9e3421c42 100644 --- a/sys/arch/sparc/sparc/machdep.c +++ b/sys/arch/sparc/sparc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.129 2010/07/02 04:14:19 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.130 2010/07/02 19:57:15 tedu Exp $ */ /* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */ /* @@ -312,11 +312,7 @@ int sigpid = 0; struct sigframe { int sf_signo; /* signal number */ siginfo_t *sf_sip; /* points to siginfo_t */ -#ifdef COMPAT_SUNOS - struct sigcontext *sf_scp; /* points to user addr of sigcontext */ -#else int sf_xxx; /* placeholder */ -#endif caddr_t sf_addr; /* SunOS compat */ struct sigcontext sf_sc; /* actual sigcontext */ siginfo_t sf_si; @@ -399,9 +395,6 @@ sendsig(catcher, sig, mask, code, type, val) struct trapframe *tf; int caddr, oonstack, oldsp, newsp; struct sigframe sf; -#ifdef COMPAT_SUNOS - extern struct emul emul_sunos; -#endif tf = p->p_md.md_tf; oldsp = tf->tf_out[6]; @@ -431,13 +424,6 @@ sendsig(catcher, sig, mask, code, type, val) */ sf.sf_signo = sig; sf.sf_sip = NULL; -#ifdef COMPAT_SUNOS - if (p->p_emul == &emul_sunos) { - sf.sf_sip = (void *)code; /* SunOS has "int code" */ - sf.sf_scp = &fp->sf_sc; - sf.sf_addr = val.sival_ptr; - } -#endif /* * Build the signal context to be used by sigreturn. @@ -491,15 +477,8 @@ sendsig(catcher, sig, mask, code, type, val) * Arrange to continue execution at the code copied out in exec(). * It needs the function to call in %g1, and a new stack pointer. */ -#ifdef COMPAT_SUNOS - if (psp->ps_usertramp & sigmask(sig)) { - caddr = (int)catcher; /* user does his own trampolining */ - } else -#endif - { - caddr = p->p_sigcode; - tf->tf_global[1] = (int)catcher; - } + caddr = p->p_sigcode; + tf->tf_global[1] = (int)catcher; tf->tf_pc = caddr; tf->tf_npc = caddr + 4; tf->tf_out[6] = newsp; @@ -888,21 +867,6 @@ mapdev(phys, virt, offset, size) return (ret); } -#ifdef COMPAT_SUNOS -int -cpu_exec_aout_makecmds(p, epp) - struct proc *p; - struct exec_package *epp; -{ - int error = ENOEXEC; - - extern int sunos_exec_aout_makecmds(struct proc *, struct exec_package *); - if ((error = sunos_exec_aout_makecmds(p, epp)) == 0) - return 0; - return error; -} -#endif - #ifdef SUN4 void oldmon_w_trace(va) |