4 files changed, 45 insertions, 4 deletions
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index bfb15969d5fd..bead57f06690 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -38,10 +38,6 @@ DOC_FILES=	COPYING AUTHORS NEWS README ChangeLog INSTALL
 BROKEN=		Runaway cc1plus process
 .endif
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .ifdef(WITH_GTK2)
 PLIST_SUB=	INSTALL_GTK2=""
 USE_GCC=	3.4+
diff --git a/emulators/vba/files/patch-src-prof_gmon.h b/emulators/vba/files/patch-src-prof_gmon.h
new file mode 100644
index 000000000000..b44f14a1fe4e
--- /dev/null
+++ b/emulators/vba/files/patch-src-prof_gmon.h
@@ -0,0 +1,11 @@
+--- src/prof/gmon.h.orig	2007-10-04 01:06:18.000000000 +0200
++++ src/prof/gmon.h	2007-10-04 01:06:48.000000000 +0200
+@@ -119,7 +119,7 @@
+ 
+ struct tostruct
+   {
+-    char *selfpc;
++    uint32_t selfpc;
+     int count;
+     unsigned short link;
+   };
diff --git a/emulators/vba/files/patch-src-prof_prof.cpp b/emulators/vba/files/patch-src-prof_prof.cpp
new file mode 100644
index 000000000000..a0908d79cec6
--- /dev/null
+++ b/emulators/vba/files/patch-src-prof_prof.cpp
@@ -0,0 +1,20 @@
+--- src/prof/prof.cpp.orig	2007-10-04 01:07:54.000000000 +0200
++++ src/prof/prof.cpp	2007-10-04 01:08:31.000000000 +0200
+@@ -279,7 +279,7 @@
+ 
+ void profCount()
+ {
+-  register char *selfpc;
++  register u32 selfpc;
+   register unsigned short *frompcindex;
+   register struct tostruct *top;
+   register struct tostruct *prevtop;
+@@ -292,7 +292,7 @@
+   
+   /* selfpc = pc pushed by mcount call.
+      This identifies the function that was just entered.  */
+-  selfpc = (char *) reg[14].I;
++  selfpc = (u32) reg[14].I;
+   /* frompcindex = pc in preceding frame.
+      This identifies the caller of the function just entered.  */
+   frompcindex = (unsigned short *) reg[12].I;
diff --git a/emulators/vba/files/patch-src-sdl_debugger.cpp b/emulators/vba/files/patch-src-sdl_debugger.cpp
new file mode 100644
index 000000000000..4a787d1ff294
--- /dev/null
+++ b/emulators/vba/files/patch-src-sdl_debugger.cpp
@@ -0,0 +1,14 @@
+--- src/sdl/debugger.cpp.orig	2007-10-04 01:11:33.000000000 +0200
++++ src/sdl/debugger.cpp	2007-10-04 01:12:22.000000000 +0200
+@@ -950,9 +950,9 @@
+ {
+   u32 address = 0;
+   if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
+-    address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
++    address = 0x2000000 + (u32)((u8 *)mem - &workRAM[0]);
+   else
+-    address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
++    address = 0x3000000 + (u32)((u8 *)mem - &internalRAM[0]);
+ 
+   if(size == 2)
+     printf("Breakpoint (on write) address %08x old:%08x new:%08x\n",