Subject: gcc3 patches for bochs
To: None <tech-pkg@netbsd.org>
From: Manuel Bouyer <bouyer@antioche.eu.org>
List: tech-pkg
Date: 10/18/2003 22:41:38
--yrj/dFKFPuw6o+aM
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi
I needed the attached patch to build bochs with gcc3.
I don't think it cause any problems with older gcc.

Should I commit it ?

-- 
Manuel Bouyer <bouyer@antioche.eu.org>
     NetBSD: 24 ans d'experience feront toujours la difference
--

--yrj/dFKFPuw6o+aM
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="bochs.diff"

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/bochs/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo	2003/02/07 04:00:33	1.13
+++ distinfo	2003/10/18 19:00:51
@@ -3,6 +3,7 @@
 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
Index: patches/patch-ab
===================================================================
RCS file: patch-ab
diff -N patch-ab
--- /dev/null	Mon Aug 30 16:41:34 1999
+++ patch-ab	Sat Oct 18 19:00:53 2003
@@ -0,0 +1,78 @@
+$NetBSD: $
+
+--- 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 }
+   };
+ 
+ /* ********** */

--yrj/dFKFPuw6o+aM--