From d503cd19ac715ece0419f80c028f6520aab87fb5 Mon Sep 17 00:00:00 2001
From: asau <asau>
Date: Mon, 31 Aug 2009 13:07:04 +0000
Subject: Fix NetBSD build. Insert omitted "defined" in
 "defined(__Dragonfly__)".

---
 emulators/qemu/distinfo         |  4 ++--
 emulators/qemu/patches/patch-dl | 20 +++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'emulators')

diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index c72b8eaf13f..37ad0e2a4cb 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2009/08/31 10:18:49 hasso Exp $
+$NetBSD: distinfo,v 1.44 2009/08/31 13:07:04 asau Exp $
 
 SHA1 (qemu-0.10.6.tar.gz) = 9432738ba513e07c981097468945b2e3ad9cb81e
 RMD160 (qemu-0.10.6.tar.gz) = 1321a10777d2e0c6b53887d0525a28cc1b36ec9b
@@ -18,5 +18,5 @@ SHA1 (patch-dh) = c4c1882c81cdbe9d98fc50e8f60f8d233a7882c5
 SHA1 (patch-di) = 96552e11794deb726cc027c41e06a378510ef534
 SHA1 (patch-dj) = 78b2cc5ba2360a7237de2207365547b84867d070
 SHA1 (patch-dk) = e8fe4d8435ed8865ab74f231e9c1dc91dab629ce
-SHA1 (patch-dl) = 9141ded6d9440863ffa0772b639f2c76b3320e4a
+SHA1 (patch-dl) = 2ba65792e342876ea5b05a70dba8d1b349661cda
 SHA1 (patch-dm) = 3786ee9dfa46648f773f06c683bccd574c5ee2cb
diff --git a/emulators/qemu/patches/patch-dl b/emulators/qemu/patches/patch-dl
index 3adffc6a8a5..c41981a3d98 100644
--- a/emulators/qemu/patches/patch-dl
+++ b/emulators/qemu/patches/patch-dl
@@ -1,12 +1,18 @@
-$NetBSD: patch-dl,v 1.1 2009/08/31 10:18:49 hasso Exp $
+$NetBSD: patch-dl,v 1.2 2009/08/31 13:07:04 asau Exp $
 
---- cpu-exec.c.orig	2009-08-31 11:06:51 +0300
-+++ cpu-exec.c	2009-08-31 11:18:49 +0300
-@@ -1156,6 +1156,12 @@ static inline int handle_cpu_signal(unsi
+--- cpu-exec.c.orig	2009-07-17 04:56:22.000000000 +0400
++++ cpu-exec.c	2009-08-31 16:38:35.000000000 +0400
+@@ -1156,6 +1156,18 @@
  # define EIP_sig(context)  (*((unsigned long*)&(context)->uc_mcontext->ss.eip))
  # define TRAP_sig(context)    ((context)->uc_mcontext->es.trapno)
  # define ERROR_sig(context)   ((context)->uc_mcontext->es.err)
-+#elif defined (__FreeBSD__) || (__DragonFly__)
++#elif defined (__NetBSD__)
++# include <ucontext.h>
++
++# define EIP_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EIP])
++# define TRAP_sig(context)    ((context)->uc_mcontext.__gregs[_REG_TRAPNO])
++# define ERROR_sig(context)   ((context)->uc_mcontext.__gregs[_REG_ERR])
++#elif defined (__FreeBSD__) || defined(__DragonFly__)
 +# include <ucontext.h>
 +
 +# define EIP_sig(context)  (*((unsigned long*)&(context)->uc_mcontext.mc_eip))
@@ -15,11 +21,11 @@ $NetBSD: patch-dl,v 1.1 2009/08/31 10:18:49 hasso Exp $
  #else
  # define EIP_sig(context)     ((context)->uc_mcontext.gregs[REG_EIP])
  # define TRAP_sig(context)    ((context)->uc_mcontext.gregs[REG_TRAPNO])
-@@ -1166,7 +1172,11 @@ int cpu_signal_handler(int host_signum, 
+@@ -1166,7 +1178,11 @@
                         void *puc)
  {
      siginfo_t *info = pinfo;
-+#if defined (__FreeBSD__) || (__DragonFly__)
++#if defined(__NetBSD__) || defined (__FreeBSD__) || defined(__DragonFly__)
 +    ucontext_t *uc = puc;
 +#else
      struct ucontext *uc = puc;
-- 
cgit v1.2.3