From 5cc237a5a1592da2621b2be4fb84508a26d9a6b9 Mon Sep 17 00:00:00 2001
From: Ian Rogers <ian.rogers@manchester.ac.uk>
Date: Thu, 16 Apr 2009 01:55:20 +0100
Subject: [PATCH] Linux/Classpath build fixes.

---
 build/targets/ia32-linux.properties   | 1 +
 build/targets/x86_64-linux.properties | 1 +
 tools/bootloader/jvm.c                | 5 +++++
 tools/bootloader/jvm.def              | 6 ++++++
 tools/bootloader/libjvm.exp           | 6 ++++++
 tools/bootloader/main.c               | 4 ----
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/build/targets/ia32-linux.properties b/build/targets/ia32-linux.properties
index 8eec8d688..fc00b9e9c 100755
--- a/build/targets/ia32-linux.properties
+++ b/build/targets/ia32-linux.properties
@@ -23,5 +23,6 @@ target.dll-ext=.so
 target.dll-prefix=lib
 target.jni-suffix=${target.dll-ext}
 target.debug-suffix=${target.dll-ext}
+target.exe-ext=
 target.arch.sse2=full
 target.arch.hw_fsqrt=true
diff --git a/build/targets/x86_64-linux.properties b/build/targets/x86_64-linux.properties
index c36895bd7..360e9b4fd 100755
--- a/build/targets/x86_64-linux.properties
+++ b/build/targets/x86_64-linux.properties
@@ -25,5 +25,6 @@ target.obj-ext=.o
 target.obj-prefix=
 target.jni-suffix=${target.dll-ext}
 target.debug-suffix=${target.dll-ext}
+target.exe-ext=
 target.arch.sse2=full
 target.arch.hw_fsqrt=true
diff --git a/tools/bootloader/jvm.c b/tools/bootloader/jvm.c
index 4b57812d0..8d5d617d3 100755
--- a/tools/bootloader/jvm.c
+++ b/tools/bootloader/jvm.c
@@ -17,6 +17,11 @@
 
 #include "sys.h"
 
+#ifndef RVM_FOR_HARMONY
+#include <sys/mman.h>
+#include <errno.h>
+#endif
+
 /** String used for name of RVM */
 char *Me;
 
diff --git a/tools/bootloader/jvm.def b/tools/bootloader/jvm.def
index 4191a5e50..1fe1e3c2a 100755
--- a/tools/bootloader/jvm.def
+++ b/tools/bootloader/jvm.def
@@ -10,6 +10,12 @@ EXPORTS
 	Me	DATA
 	bootRecord	DATA
 	verbose	DATA
+	bootCodeFilename	DATA
+	bootDataFilename	DATA
+	bootRMapFilename	DATA
+	initialHeapSize	DATA
+	maximumHeapSize	DATA
+	verboseBoot	DATA
 	sysJavaVM	DATA
 	findMappable
 	parse_memory_size
diff --git a/tools/bootloader/libjvm.exp b/tools/bootloader/libjvm.exp
index 6c37aeb18..d0a3fe94e 100755
--- a/tools/bootloader/libjvm.exp
+++ b/tools/bootloader/libjvm.exp
@@ -7,6 +7,12 @@ JVM_0.1 {
     Me;
     bootRecord;
     verbose;
+    bootCodeFilename;
+    bootDataFilename;
+    bootRMapFilename;
+    initialHeapSize;
+    maximumHeapSize;
+    verboseBoot;
     sysJavaVM;
     findMappable;
     parse_memory_size;
diff --git a/tools/bootloader/main.c b/tools/bootloader/main.c
index 74c848497..14124db47 100755
--- a/tools/bootloader/main.c
+++ b/tools/bootloader/main.c
@@ -26,10 +26,6 @@
 #include <stdlib.h>
 #include <string.h> /* strcmp, ... */
 
-#ifndef RVM_FOR_HARMONY
-#include <sys/mman.h>
-#endif
-
 #define BYTES_IN_PAGE MMTk_Constants_BYTES_IN_PAGE
 
 /* These definitions must remain in sync with nonStandardArgs, the array