From fe988ad4ebb12b22e3c6e269b46358b45b8cd148 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Sat, 6 Jan 2007 21:21:35 +0000
Subject: Add patches to make this build/work on NetBSD/macppc, sent by Zach
 Lowry privately.

---
 emulators/qemu/distinfo         |  7 ++++---
 emulators/qemu/patches/patch-ag | 11 ++++++++++-
 emulators/qemu/patches/patch-at | 17 +++++++++++++++++
 emulators/qemu/patches/patch-aw | 18 ++++++++++++++----
 4 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 emulators/qemu/patches/patch-at

(limited to 'emulators')

diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index b7e8a14b3fa..b7476d7d603 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2006/12/07 16:06:39 xtraeme Exp $
+$NetBSD: distinfo,v 1.31 2007/01/06 21:21:35 xtraeme Exp $
 
 SHA1 (qemu-0.8.2.tar.gz) = d775239a545e7d0c5b677660a2122df590afde6d
 RMD160 (qemu-0.8.2.tar.gz) = 715c24997330352aa675cd7279731cec251f833a
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
 SHA1 (patch-ab) = 12838d78eed85c575214f4ce632a4b6694c6f97f
 SHA1 (patch-ac) = f1231bcfde687ebe7a7ea4898593cd3818f03142
 SHA1 (patch-af) = c139e919da430c0118dc774587e1e6dd718d7926
-SHA1 (patch-ag) = 3ff150954bc73b3c02670c90df79f79484ea5d20
+SHA1 (patch-ag) = 91f10c4556a45ca3ec19efe67dcaa6625902c120
 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
 SHA1 (patch-aj) = 4972ee341782419114972b91fb6354ee9881b60f
@@ -17,7 +17,8 @@ SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
 SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0
 SHA1 (patch-ap) = 6cd565b9a3b06aea12fbedb1199e16dd0f3577ae
 SHA1 (patch-as) = 0df64b325b758a88fe61590e129bab2b3f99ce63
+SHA1 (patch-at) = c6f0129eccf7574e3832aff746d2f0bd442de7c1
 SHA1 (patch-au) = 29d05fb5f4717fb572491d9d0653ec74ba46ae7e
-SHA1 (patch-aw) = 6299964fb3a747e8f5dfe4354e66722030ee9a75
+SHA1 (patch-aw) = 3b1472a95a2312f9e49ea1a6aa517ad81328324c
 SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
 SHA1 (patch-ay) = 45fa8b5720185b5bfe2d1c00f599565f286ea4f5
diff --git a/emulators/qemu/patches/patch-ag b/emulators/qemu/patches/patch-ag
index 165c56cae27..7aea34e0c94 100644
--- a/emulators/qemu/patches/patch-ag
+++ b/emulators/qemu/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.7 2006/12/07 16:06:39 xtraeme Exp $
+$NetBSD: patch-ag,v 1.8 2007/01/06 21:21:35 xtraeme Exp $
 
 --- configure.orig	2006-12-07 16:59:57.000000000 +0100
 +++ configure	2006-12-07 17:02:12.000000000 +0100
@@ -11,6 +11,15 @@ $NetBSD: patch-ag,v 1.7 2006/12/07 16:06:39 xtraeme Exp $
  target_list=""
  case "$cpu" in
    i386|i486|i586|i686|i86pc|BePC)
+@@ -42,7 +42,7 @@
+   alpha)
+     cpu="alpha"
+   ;;
+-  "Power Macintosh"|ppc|ppc64)
++  "Power Macintosh"|ppc|ppc64|powerpc)
+     cpu="powerpc"
+   ;;
+   mips)
 @@ -115,6 +115,12 @@
      kqemu="yes"
  fi
diff --git a/emulators/qemu/patches/patch-at b/emulators/qemu/patches/patch-at
new file mode 100644
index 00000000000..244709232e3
--- /dev/null
+++ b/emulators/qemu/patches/patch-at
@@ -0,0 +1,17 @@
+--- target-sparc/op_helper.c.orig	2006-07-22 17:23:34.000000000 +0000
++++ target-sparc/op_helper.c	2007-01-05 21:51:15.000000000 +0000
+@@ -12,12 +12,12 @@
+ #ifdef USE_INT_TO_FLOAT_HELPERS
+ void do_fitos(void)
+ {
+-    FT0 = int32_to_float32(*((int32_t *)&FT1));
++    FT0 = int32_to_float32(*((int32_t *)&FT1), &env->fp_status);
+ }
+ 
+ void do_fitod(void)
+ {
+-    DT0 = int32_to_float64(*((int32_t *)&FT1));
++    DT0 = int32_to_float64(*((int32_t *)&FT1), &env->fp_status);
+ }
+ #endif
+ 
diff --git a/emulators/qemu/patches/patch-aw b/emulators/qemu/patches/patch-aw
index 8d60e3b6602..82ec52ee810 100644
--- a/emulators/qemu/patches/patch-aw
+++ b/emulators/qemu/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.1 2005/05/03 11:18:47 xtraeme Exp $
+$NetBSD: patch-aw,v 1.2 2007/01/06 21:21:35 xtraeme Exp $
 
 Workaround for x86_64 target, patch from Hubert Feyrer.
 
@@ -7,9 +7,9 @@ Index: dyngen.c
 RCS file: /cvsroot/qemu/qemu/dyngen.c,v
 retrieving revision 1.40
 diff -u -r1.40 dyngen.c
---- dyngen.c	27 Apr 2005 19:55:58 -0000	1.40
-+++ dyngen.c	1 May 2005 20:22:09 -0000
-@@ -1587,6 +1587,7 @@
+--- dyngen.c.orig	2007-01-05 20:32:17.000000000 +0000
++++ dyngen.c	2007-01-05 20:36:45.000000000 +0000
+@@ -1624,6 +1624,7 @@
                  if(!sym_name)
                      continue;
                  if (*sym_name && 
@@ -17,3 +17,13 @@ diff -u -r1.40 dyngen.c
                      !strstart(sym_name, "__op_param", NULL) &&
                      !strstart(sym_name, "__op_jmp", NULL) &&
                      !strstart(sym_name, "__op_gen_label", NULL)) {
+@@ -1647,6 +1648,9 @@
+ 				 */
+ 				fprintf(outfile, "    extern char %s;\n",
+ 					sym_name);
++#elif defined(HOST_PPC)
++                    if(strcmp("bswap32", sym_name))
++                        fprintf(outfile, "extern char %s;\n", sym_name);
+ #else
+                     fprintf(outfile, "extern char %s;\n", sym_name);
+ #endif
-- 
cgit v1.2.3