Fix build with modern GCC

9 files changed, 111 insertions, 1 deletions

diff --git a/emulators/vmips/distinfo b/emulators/vmips/distinfo
index 0357d7a804d..5ee1c44223a 100644
--- a/emulators/vmips/distinfo
+++ b/emulators/vmips/distinfo
@@ -1,7 +1,15 @@
-$NetBSD: distinfo,v 1.2 2007/10/10 11:29:19 rillig Exp $
+$NetBSD: distinfo,v 1.3 2011/11/27 19:39:09 joerg Exp $
 
 SHA1 (vmips-1.3.1.tar.gz) = 0ca5d942db5ceaabe18aae831e80df59be8e16d9
 RMD160 (vmips-1.3.1.tar.gz) = cfc831072cac4295e26fc57d8ed892d56f32c81a
 Size (vmips-1.3.1.tar.gz) = 1144409 bytes
 SHA1 (patch-aa) = c8ba30db8a11adfd3848771e8eea5bdb0821b767
 SHA1 (patch-ab) = 3cc0b6f7a02f06cfbf9d70a1b26944b89f834c56
+SHA1 (patch-cpu.cc) = 723ab3f436a460b3a7cca0f7610943606a8bdc3e
+SHA1 (patch-cpzero.h) = 7b476c321a0a7a272c7af3b32c38d02d3e991349
+SHA1 (patch-debug.cc) = c2307568ec6c5854c1a9e7fe6176069e4551ffca
+SHA1 (patch-exeloader.cc) = df1facc3acaf78f3f57b398dc201a94a5cf67edf
+SHA1 (patch-options.cc) = ac2319232f2e8cec8f4cc7c9117f3ac8faa88f99
+SHA1 (patch-terminalcontroller.cc) = 9927a984d99f3ca2cfe4861e89d7e9a288f338c1
+SHA1 (patch-vmips.cc) = 4783cd484c251427efc93c384616a06b67593664
+SHA1 (patch-vmipstool.cc) = cc8b271f868f999e389eadc959e36747a5d9a444
diff --git a/emulators/vmips/patches/patch-cpu.cc b/emulators/vmips/patches/patch-cpu.cc
new file mode 100644
index 00000000000..eb42765bea5
--- /dev/null
+++ b/emulators/vmips/patches/patch-cpu.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-cpu.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
+
+--- cpu.cc.orig	2011-11-27 02:48:15.000000000 +0000
++++ cpu.cc
+@@ -17,6 +17,7 @@ You should have received a copy of the G
+ with VMIPS; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ 
++#include <string.h>
+ #include "cpu.h"
+ #include "cpzero.h"
+ #include "debug.h"
diff --git a/emulators/vmips/patches/patch-cpzero.h b/emulators/vmips/patches/patch-cpzero.h
new file mode 100644
index 00000000000..e9db83ea024
--- /dev/null
+++ b/emulators/vmips/patches/patch-cpzero.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-cpzero.h,v 1.1 2011/11/27 19:39:09 joerg Exp $
+
+--- cpzero.h.orig	2011-11-27 02:49:21.000000000 +0000
++++ cpzero.h
+@@ -53,7 +53,7 @@ class CPZero
+ 	void tlbp_emulate(uint32 instr, uint32 pc);
+ 	void rfe_emulate(uint32 instr, uint32 pc);
+ 	void load_addr_trans_excp_info(uint32 va, uint32 vpn, TLBEntry *match);
+-	int find_matching_tlb_entry(uint32 asid, uint32 asid);
++	int find_matching_tlb_entry(uint32 asid, uint32 asid2);
+ 	uint32 tlb_translate(uint32 seg, uint32 vaddr, int mode,
+ 		bool *cacheable, DeviceExc *client);
+ 
diff --git a/emulators/vmips/patches/patch-debug.cc b/emulators/vmips/patches/patch-debug.cc
new file mode 100644
index 00000000000..3a8f5a12122
--- /dev/null
+++ b/emulators/vmips/patches/patch-debug.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-debug.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
+
+--- debug.cc.orig	2011-11-27 02:49:35.000000000 +0000
++++ debug.cc
+@@ -17,6 +17,8 @@ You should have received a copy of the G
+ with VMIPS; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include "debug.h"
+ #include "remotegdb.h"
+ #include "cpu.h"
diff --git a/emulators/vmips/patches/patch-exeloader.cc b/emulators/vmips/patches/patch-exeloader.cc
new file mode 100644
index 00000000000..1c7881625a2
--- /dev/null
+++ b/emulators/vmips/patches/patch-exeloader.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-exeloader.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
+
+--- exeloader.cc.orig	2011-11-27 02:49:56.000000000 +0000
++++ exeloader.cc
+@@ -18,6 +18,7 @@ with VMIPS; if not, write to the Free So
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ 
+ #include <string>
++#include <cstring>
+ #include <cerrno>
+ #include <cstdio>
+ #include "vmips.h"
diff --git a/emulators/vmips/patches/patch-options.cc b/emulators/vmips/patches/patch-options.cc
new file mode 100644
index 00000000000..e385265ef1e
--- /dev/null
+++ b/emulators/vmips/patches/patch-options.cc
@@ -0,0 +1,14 @@
+$NetBSD: patch-options.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
+
+--- options.cc.orig	2011-11-27 02:50:22.000000000 +0000
++++ options.cc
+@@ -25,6 +25,9 @@ with VMIPS; if not, write to the Free So
+ #include <cctype>
+ #include <cerrno>
+ #include <cstdio>
++#include <climits>
++#include <cstdlib>
++#include <cstring>
+ #include <pwd.h>
+ #include <string>
+ #include <unistd.h>
diff --git a/emulators/vmips/patches/patch-terminalcontroller.cc b/emulators/vmips/patches/patch-terminalcontroller.cc
new file mode 100644
index 00000000000..dbdfccc36ae
--- /dev/null
+++ b/emulators/vmips/patches/patch-terminalcontroller.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-terminalcontroller.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
+
+--- terminalcontroller.cc.orig	2011-11-27 02:51:21.000000000 +0000
++++ terminalcontroller.cc
+@@ -21,6 +21,7 @@ with VMIPS; if not, write to the Free So
+ #include "error.h"
+ #include "terminalcontroller.h"
+ #include <cassert>
++#include <cstring>
+ #include <errno.h>
+ #include <sys/time.h>
+ #include <unistd.h>
diff --git a/emulators/vmips/patches/patch-vmips.cc b/emulators/vmips/patches/patch-vmips.cc
new file mode 100644
index 00000000000..a1c56059759
--- /dev/null
+++ b/emulators/vmips/patches/patch-vmips.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-vmips.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
+
+--- vmips.cc.orig	2011-11-27 02:51:01.000000000 +0000
++++ vmips.cc
+@@ -50,6 +50,7 @@ with VMIPS; if not, write to the Free So
+ #include <cassert>
+ #include <csignal>
+ #include <cstdarg>
++#include <cstring>
+ #include <string>
+ #include <exception>
+ 
diff --git a/emulators/vmips/patches/patch-vmipstool.cc b/emulators/vmips/patches/patch-vmipstool.cc
new file mode 100644
index 00000000000..f8d3ef25896
--- /dev/null
+++ b/emulators/vmips/patches/patch-vmipstool.cc
@@ -0,0 +1,14 @@
+$NetBSD: patch-vmipstool.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
+
+--- vmipstool.cc.orig	2011-11-27 02:51:38.000000000 +0000
++++ vmipstool.cc
+@@ -33,6 +33,9 @@ int getpagesize(void);
+ #include <cerrno>
+ #include <cstdarg>
+ #include <cstdio>
++#include <climits>
++#include <cstdlib>
++#include <cstring>
+ #include <iostream>
+ #include <sys/stat.h>
+ #include <sys/wait.h>