From e6f190b3bc6f0a8a16ae53b513cef08aba333d46 Mon Sep 17 00:00:00 2001
From: bouyer <bouyer@pkgsrc.org>
Date: Fri, 24 Oct 2003 22:03:53 +0000
Subject: Add a patch so that it builds with gcc3. Confirmed to still build
 with gcc2 by Julio M. Merino Vidal.

---
 emulators/bochs/distinfo         |  3 +-
 emulators/bochs/patches/patch-ab | 78 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 emulators/bochs/patches/patch-ab

(limited to 'emulators')

diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 57de45e3dfd..04ab9400735 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2003/02/07 04:00:33 fredb Exp $
+$NetBSD: distinfo,v 1.14 2003/10/24 22:03:53 bouyer Exp $
 
 SHA1 (bochs-2.0.2.tar.gz) = 94a133dbfa646eda19c27e060df1c1e098a75be3
 Size (bochs-2.0.2.tar.gz) = 3269299 bytes
 SHA1 (patch-aa) = bbe026a0487dee7ac00cf75500d38b600f473c8f
+SHA1 (patch-ab) = 1646ba658064a6fe449ba4d1e0a98afb9b114e13
 SHA1 (patch-ad) = 3ce76c962920677c383ce2f61fb20565ddbd8777
 SHA1 (patch-ae) = 510238ed28e8aa79f4dd8780d54ac66f317a9380
 SHA1 (patch-af) = 931805d3523baab6cc16bd1052f059309aab75a7
diff --git a/emulators/bochs/patches/patch-ab b/emulators/bochs/patches/patch-ab
new file mode 100644
index 00000000000..f5a9951d796
--- /dev/null
+++ b/emulators/bochs/patches/patch-ab
@@ -0,0 +1,78 @@
+$NetBSD: patch-ab,v 1.5 2003/10/24 22:03:53 bouyer Exp $
+
+--- cpu/fetchdecode.cc.orig	2003-10-18 20:42:56.000000000 +0200
++++ cpu/fetchdecode.cc	2003-10-18 20:45:25.000000000 +0200
+@@ -160,53 +160,53 @@
+ } BxOpcodeInfo_t;
+ 
+ static BxOpcodeInfo_t opcodesADD_EwIw[2] = {
+-  { 0,  { &BX_CPU_C::ADD_EEwIw } },
+-  { 0,  { &BX_CPU_C::ADD_EGwIw } }
++  { 0,  &BX_CPU_C::ADD_EEwIw  },
++  { 0,  &BX_CPU_C::ADD_EGwIw  }
+   };
+ 
+ static BxOpcodeInfo_t opcodesADD_EdId[2] = {
+-  { 0,  { &BX_CPU_C::ADD_EEdId } },
+-  { 0,  { &BX_CPU_C::ADD_EGdId } }
++  { 0,  &BX_CPU_C::ADD_EEdId },
++  { 0,  &BX_CPU_C::ADD_EGdId }
+   };
+ 
+ static BxOpcodeInfo_t opcodesADD_GwEw[2] = {
+-  { 0,  { &BX_CPU_C::ADD_GwEEw } },
+-  { 0,  { &BX_CPU_C::ADD_GwEGw } }
++  { 0,  &BX_CPU_C::ADD_GwEEw },
++  { 0,  &BX_CPU_C::ADD_GwEGw }
+   };
+ 
+ static BxOpcodeInfo_t opcodesADD_GdEd[2] = {
+-  { 0,  { &BX_CPU_C::ADD_GdEEd } },
+-  { 0,  { &BX_CPU_C::ADD_GdEGd } }
++  { 0,  &BX_CPU_C::ADD_GdEEd },
++  { 0,  &BX_CPU_C::ADD_GdEGd }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_GbEb[2] = {
+-  { 0,  { &BX_CPU_C::MOV_GbEEb } },
+-  { 0,  { &BX_CPU_C::MOV_GbEGb } }
++  { 0,  &BX_CPU_C::MOV_GbEEb },
++  { 0,  &BX_CPU_C::MOV_GbEGb }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_GwEw[2] = {
+-  { 0,  { &BX_CPU_C::MOV_GwEEw } },
+-  { 0,  { &BX_CPU_C::MOV_GwEGw } }
++  { 0,  &BX_CPU_C::MOV_GwEEw },
++  { 0,  &BX_CPU_C::MOV_GwEGw }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_GdEd[2] = {
+-  { 0,  { &BX_CPU_C::MOV_GdEEd } },
+-  { 0,  { &BX_CPU_C::MOV_GdEGd } }
++  { 0,  &BX_CPU_C::MOV_GdEEd },
++  { 0,  &BX_CPU_C::MOV_GdEGd }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_EbGb[2] = {
+-  { 0,  { &BX_CPU_C::MOV_EEbGb } },
+-  { 0,  { &BX_CPU_C::MOV_EGbGb } }
++  { 0,  &BX_CPU_C::MOV_EEbGb },
++  { 0,  &BX_CPU_C::MOV_EGbGb }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_EwGw[2] = {
+-  { 0,  { &BX_CPU_C::MOV_EEwGw } },
+-  { 0,  { &BX_CPU_C::MOV_EGwGw } }
++  { 0,  &BX_CPU_C::MOV_EEwGw },
++  { 0,  &BX_CPU_C::MOV_EGwGw }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_EdGd[2] = {
+-  { 0,  { &BX_CPU_C::MOV_EEdGd } },
+-  { 0,  { &BX_CPU_C::MOV_EGdGd } }
++  { 0,  &BX_CPU_C::MOV_EEdGd },
++  { 0,  &BX_CPU_C::MOV_EGdGd }
+   };
+ 
+ /* ********** */
-- 
cgit v1.2.3