be consistent about siginfo handling (treat as union on NetBSD,

keep the struct on the rest)

4 files changed, 44 insertions, 17 deletions

diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index a52a9495205..28a4124226b 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2006/01/01 13:48:45 xtraeme Exp $
+$NetBSD: distinfo,v 1.17 2006/01/01 19:12:54 hubertf Exp $
 
 SHA1 (qemu-0.8.0.tar.gz) = f7bcf2f0eee9e5207cba265f3c47ae781244628e
 RMD160 (qemu-0.8.0.tar.gz) = 3fc6da938f75364d0805ca0ecf8cb84a4b546dc7
 Size (qemu-0.8.0.tar.gz) = 1497965 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
-SHA1 (patch-ab) = e12c98cf7e92b965b6fd46aa9140c7adfcf6a9d5
+SHA1 (patch-ab) = 449195421ad1dbb2592f694d1c4b80f2ea35113c
 SHA1 (patch-ac) = fa190b38658ad487a6ddf6d78cc3cbb262c67702
 SHA1 (patch-af) = 221d6d85aa898cb27462806faab58ee2a9871a1c
 SHA1 (patch-ag) = 86df0bb94e71d87cf61d19404b53e3572384874e
@@ -12,10 +12,10 @@ SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
 SHA1 (patch-aj) = d050b84489e74036994c19e982a363d74df797ab
 SHA1 (patch-ak) = 0153a85109baa2314dc53d6cbbacb98b0c517099
-SHA1 (patch-al) = d87d8c4bd0a422b0e1c2b52d049e9ac807cf1375
+SHA1 (patch-al) = 440b2ad677fd42dd667035dde13b08ab658be867
 SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
 SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0
-SHA1 (patch-ap) = b45baf052fbf8319596c37a2690c343f14b33a11
+SHA1 (patch-ap) = 6cd565b9a3b06aea12fbedb1199e16dd0f3577ae
 SHA1 (patch-as) = 0df64b325b758a88fe61590e129bab2b3f99ce63
 SHA1 (patch-au) = aa2712c382a67beef9225e710e7735ba15995a41
 SHA1 (patch-av) = bd88088f41b6b3c256eec933e5f267fc432e58fa
diff --git a/emulators/qemu/patches/patch-ab b/emulators/qemu/patches/patch-ab
new file mode 100644
index 00000000000..18182b906aa
--- /dev/null
+++ b/emulators/qemu/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.5 2006/01/01 19:12:54 hubertf Exp $
+
+--- target-arm/cpu.h.orig	2005-12-19 23:51:53.000000000 +0100
++++ target-arm/cpu.h
+@@ -122,9 +122,15 @@ void switch_mode(CPUARMState *, int);
+ /* you can call this signal handler from your SIGBUS and SIGSEGV
+    signal handlers to inform the virtual CPU of exceptions. non zero
+    is returned if the signal was handled by the virtual CPU.  */
++#ifdef __NetBSD__
++union siginfo;
++int cpu_x86_signal_handler(int host_signum, union siginfo *info,
++                           void *puc);
++#else
+ struct siginfo;
+ int cpu_arm_signal_handler(int host_signum, struct siginfo *info, 
+                            void *puc);
++#endif
+ 
+ #define CPSR_M (0x1f)
+ #define CPSR_T (1 << 5)
diff --git a/emulators/qemu/patches/patch-al b/emulators/qemu/patches/patch-al
index 75939d164e1..0ba984d3ff3 100644
--- a/emulators/qemu/patches/patch-al
+++ b/emulators/qemu/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1 2004/11/15 11:35:30 xtraeme Exp $
+$NetBSD: patch-al,v 1.2 2006/01/01 19:12:54 hubertf Exp $
 
---- osdep.h.orig	2004-11-15 12:01:18.000000000 +0100
-+++ osdep.h	2004-11-15 12:01:55.000000000 +0100
+--- osdep.h.orig	2005-12-19 23:51:53.000000000 +0100
++++ osdep.h
 @@ -2,6 +2,8 @@
  #define QEMU_OSDEP_H
  
@@ -11,12 +11,15 @@ $NetBSD: patch-al,v 1.1 2004/11/15 11:35:30 xtraeme Exp $
  
  int qemu_vsnprintf(char *buf, int buflen, const char *fmt, va_list args);
  void qemu_vprintf(const char *fmt, va_list ap);
-@@ -28,7 +30,7 @@
+@@ -31,7 +33,11 @@ extern void __longjmp(jmp_buf env, int v
  struct qemu_sigaction {
      union {
          void (*_sa_handler)(int);
--        void (*_sa_sigaction)(int, struct siginfo *, void *);
-+        void (*_sa_sigaction)(int, siginfo_t *, void *);
++#ifdef __NetBSD__
++        void (*_sa_sigaction)(int, union siginfo *, void *);
++#else
+         void (*_sa_sigaction)(int, struct siginfo *, void *);
++#endif
      } _u;
      unsigned long sa_flags;
      void (*sa_restorer)(void);
diff --git a/emulators/qemu/patches/patch-ap b/emulators/qemu/patches/patch-ap
index 06b5728b8ab..24c6b899427 100644
--- a/emulators/qemu/patches/patch-ap
+++ b/emulators/qemu/patches/patch-ap
@@ -1,14 +1,18 @@
-$NetBSD: patch-ap,v 1.4 2005/10/23 19:55:59 rillig Exp $
+$NetBSD: patch-ap,v 1.5 2006/01/01 19:12:54 hubertf Exp $
 
---- target-sparc/cpu.h.orig	2005-07-29 18:24:50.000000000 +0200
-+++ target-sparc/cpu.h	2005-07-29 18:25:12.000000000 +0200
-@@ -284,8 +284,7 @@
+--- target-sparc/cpu.h.orig	2005-12-19 23:51:53.000000000 +0100
++++ target-sparc/cpu.h
+@@ -269,8 +269,13 @@ void cpu_set_cwp(CPUSPARCState *env1, in
      } while (0)
  #endif
  
--struct siginfo;
--int cpu_sparc_signal_handler(int hostsignum, struct siginfo *info, void *puc);
-+int cpu_sparc_signal_handler(int hostsignum, siginfo_t *info, void *puc);
++#ifdef __NetBSD__
++union siginfo;
++int cpu_sparc_signal_handler(int hostsignum, union siginfo *info, void *puc);
++#else
+ struct siginfo;
+ int cpu_sparc_signal_handler(int hostsignum, struct siginfo *info, void *puc);
++#endif
  
  #include "cpu-all.h"