[src/trunk]: src/sys Build PowerPC again with _HAS_SIGINFO. Remove the ifdef ...

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/079c082c91ff
branches:  trunk
changeset: 552712:079c082c91ff
user:      manu <manu%NetBSD.org@localhost>
date:      Tue Sep 30 21:04:54 2003 +0000

description:
Build PowerPC again with _HAS_SIGINFO. Remove the ifdef on _HAS_SIGINFO
in the header file since all platforms supported by COMPAT_DARWIN now have it.

diffstat:

 sys/arch/powerpc/powerpc/darwin_machdep.c |  16 ++++++++++---
 sys/arch/powerpc/powerpc/mach_machdep.c   |  34 +-----------------------------
 sys/compat/darwin/darwin_signal.h         |   6 +----
 3 files changed, 15 insertions(+), 41 deletions(-)

diffs (124 lines):

diff -r 6a75685019ee -r 079c082c91ff sys/arch/powerpc/powerpc/darwin_machdep.c
--- a/sys/arch/powerpc/powerpc/darwin_machdep.c Tue Sep 30 21:01:59 2003 +0000
+++ b/sys/arch/powerpc/powerpc/darwin_machdep.c Tue Sep 30 21:04:54 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: darwin_machdep.c,v 1.8 2003/09/27 04:44:42 matt Exp $ */
+/*     $NetBSD: darwin_machdep.c,v 1.9 2003/09/30 21:04:54 manu Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_machdep.c,v 1.8 2003/09/27 04:44:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_machdep.c,v 1.9 2003/09/30 21:04:54 manu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -64,7 +64,9 @@
  * Send a signal to a Darwin process.
  */
 void
-darwin_sendsig(int sig, const sigset_t *mask, u_long code)
+darwin_sendsig(ksi, mask)
+       const ksiginfo_t *ksi;
+       const sigset_t *mask;
 {
        struct lwp *l = curlwp;
        struct proc *p = l->l_proc;
@@ -73,11 +75,17 @@
        struct darwin_sigframe *sfp, sf;
        int onstack;
        size_t stack_size;
-       sig_t catcher = SIGACTION(p, sig).sa_handler;
+       sig_t catcher;
+       int sig;
+       u_long code;
        int error;
 
        tf = trapframe(l);
 
+       sig = ksi->_signo;
+       code = ksi->_code;
+       catcher = SIGACTION(p, sig).sa_handler;
+
        /* Use an alternate signal stack? */
        onstack =
            (p->p_sigctx.ps_sigstk.ss_flags & (SS_DISABLE | SS_ONSTACK)) == 0 &&
diff -r 6a75685019ee -r 079c082c91ff sys/arch/powerpc/powerpc/mach_machdep.c
--- a/sys/arch/powerpc/powerpc/mach_machdep.c   Tue Sep 30 21:01:59 2003 +0000
+++ b/sys/arch/powerpc/powerpc/mach_machdep.c   Tue Sep 30 21:04:54 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mach_machdep.c,v 1.14 2003/09/27 04:44:42 matt Exp $ */
+/*     $NetBSD: mach_machdep.c,v 1.15 2003/09/30 21:04:54 manu Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_machdep.c,v 1.14 2003/09/27 04:44:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_machdep.c,v 1.15 2003/09/30 21:04:54 manu Exp $");
 
 #include "opt_ppcarch.h"
 #include <sys/param.h>
@@ -71,36 +71,6 @@
 
 #include <uvm/uvm_extern.h>
 
-void mach_trap(struct trapframe *);
-
-/*
- * Fast syscall gate trap...
- */
-void
-mach_trap(struct trapframe *frame)
-{
-       extern struct emul emul_mach;
-       struct lwp *l = curlwp;
-
-       if (l->l_proc->p_emul != &emul_mach) {
-               DPRINTF(("mach trap %d on bad emulation\n", frame->exc));
-               trapsignal(l, SIGBUS, 0);
-               return;
-       }
-
-       switch (frame->exc) {
-       case 0:
-               DPRINTF(("mach_pthread_self();\n"));
-               break;
-       case 1:
-               DPRINTF(("mach_pthread_set_self();\n"));
-               break;
-       default:
-               uprintf("unknown mach trap %d\n", frame->exc);
-               break;
-       }
-}
-
 void
 mach_host_basic_info(struct mach_host_basic_info *info)
 {
diff -r 6a75685019ee -r 079c082c91ff sys/compat/darwin/darwin_signal.h
--- a/sys/compat/darwin/darwin_signal.h Tue Sep 30 21:01:59 2003 +0000
+++ b/sys/compat/darwin/darwin_signal.h Tue Sep 30 21:04:54 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: darwin_signal.h,v 1.7 2003/09/25 22:00:02 christos Exp $ */
+/*     $NetBSD: darwin_signal.h,v 1.8 2003/09/30 21:04:54 manu Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -79,11 +79,7 @@
        int darwin_sa_flags;
 };
 
-#ifdef __HAVE_SIGINFO
 void darwin_sendsig(const ksiginfo_t *, const sigset_t *);
-#else
-void darwin_sendsig(int, sigset_t *, u_long);
-#endif
 
 #endif /* _DARWIN_SIGNAL_H_ */