From 9008a3cf10c7017166fe0fb1dbae076c5282a41f Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Fri, 6 Jan 2006 09:17:03 +0000
Subject: Apply patches from Tobyas Nigren (PR pkg/32464) to make this build on
 NetBSD/amd64. Thank you Tobias!

---
 emulators/qemu/Makefile         |  4 ++--
 emulators/qemu/distinfo         |  4 +++-
 emulators/qemu/patches/patch-ax | 24 ++++++++++++++++++++++++
 emulators/qemu/patches/patch-ay | 16 ++++++++++++++++
 4 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 emulators/qemu/patches/patch-ax
 create mode 100644 emulators/qemu/patches/patch-ay

(limited to 'emulators')

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 65edc815865..cd39a218442 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/01/01 13:48:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/06 09:17:03 xtraeme Exp $
 #
 
 DISTNAME=		qemu-0.8.0
@@ -32,7 +32,7 @@ SUBST_MESSAGE.smbd=	"Fixing hardcoded paths."
 
 # Remove -march/-mcpu from CFLAGS, otherwise it will fail
 # to build in the SSE code.
-BUILDLINK_TRANSFORM+=	rm-optarg:-march rm-optarg:-mcpu
+#BUILDLINK_TRANSFORM+=	rm-optarg:-march rm-optarg:-mcpu
 
 .include "../../mk/compiler.mk"
 
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 161e615c7a5..b98b58e67e3 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2006/01/02 12:19:52 blymn Exp $
+$NetBSD: distinfo,v 1.19 2006/01/06 09:17:03 xtraeme Exp $
 
 SHA1 (qemu-0.8.0.tar.gz) = f7bcf2f0eee9e5207cba265f3c47ae781244628e
 RMD160 (qemu-0.8.0.tar.gz) = 3fc6da938f75364d0805ca0ecf8cb84a4b546dc7
@@ -20,3 +20,5 @@ SHA1 (patch-as) = 0df64b325b758a88fe61590e129bab2b3f99ce63
 SHA1 (patch-au) = aa2712c382a67beef9225e710e7735ba15995a41
 SHA1 (patch-av) = bd88088f41b6b3c256eec933e5f267fc432e58fa
 SHA1 (patch-aw) = 6299964fb3a747e8f5dfe4354e66722030ee9a75
+SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
+SHA1 (patch-ay) = b1a2c96012cc24c3818f1c494eadbbd9968ea085
diff --git a/emulators/qemu/patches/patch-ax b/emulators/qemu/patches/patch-ax
new file mode 100644
index 00000000000..37a30212fae
--- /dev/null
+++ b/emulators/qemu/patches/patch-ax
@@ -0,0 +1,24 @@
+$NetBSD: patch-ax,v 1.3 2006/01/06 09:17:03 xtraeme Exp $
+
+--- target-i386/op.c.orig	2006-01-06 05:10:30.000000000 +0100
++++ target-i386/op.c
+@@ -2099,14 +2099,17 @@ void OPPROTO op_fdivr_STN_ST0(void)
+ }
+ 
+ /* misc FPU operations */
++
++void fchs_dummy() {ST0 = floatx_chs(ST0);}
+ void OPPROTO op_fchs_ST0(void)
+ {
+-    ST0 = floatx_chs(ST0);
++    fchs_dummy();
+ }
+ 
++void fabs_dummy() {ST0 = floatx_abs(ST0);}
+ void OPPROTO op_fabs_ST0(void)
+ {
+-    ST0 = floatx_abs(ST0);
++    fabs_dummy();
+ }
+ 
+ void OPPROTO op_fxam_ST0(void)
diff --git a/emulators/qemu/patches/patch-ay b/emulators/qemu/patches/patch-ay
new file mode 100644
index 00000000000..25355129e80
--- /dev/null
+++ b/emulators/qemu/patches/patch-ay
@@ -0,0 +1,16 @@
+$NetBSD: patch-ay,v 1.3 2006/01/06 09:17:03 xtraeme Exp $
+
+--- target-sparc/op.c.orig	2005-12-19 23:51:53.000000000 +0100
++++ target-sparc/op.c
+@@ -1299,9 +1299,10 @@ void OPPROTO op_flush_T0(void)
+     helper_flush(T0);
+ }
+ 
++void fnegs_dummy() {FT0 = -FT1;}
+ void OPPROTO op_fnegs(void)
+ {
+-    FT0 = -FT1;
++	fnegs_dummy();
+ }
+ 
+ void OPPROTO op_fabss(void)
-- 
cgit v1.2.3