diff --git a/build.xml b/build.xml
index ddc59c080..a85489709 100644
--- a/build.xml
+++ b/build.xml
@@ -123,6 +123,10 @@
+
+
+
+
@@ -135,19 +139,26 @@
directory without the .properties suffix.
-
-
-
+
-
+
@@ -352,7 +363,7 @@ Check to make sure all required properties are specified. This includes properti
-
+
@@ -361,7 +372,7 @@ Check to make sure all required properties are specified. This includes properti
-
+
@@ -1484,14 +1495,15 @@ Check to make sure all required properties are specified. This includes properti
-
- const unsigned heap_default_initial_size = ${config.default-heapsize.initial}*1024*1024;
- const unsigned heap_default_maximum_size = ${config.default-heapsize.maximum}*1024*1024;
- const char *rvm_version = "Jikes RVM ${rvm.version} (r${svn.revision})";
- const char *rvm_configuration = "${config.name}";
- const char *rvm_host_configuration = "${config.file}";
- const char *rvm_target_configuration = "${target.file}";
-
+
+const unsigned heap_default_initial_size = ${config.default-heapsize.initial}*1024*1024;
+const unsigned heap_default_maximum_size = ${config.default-heapsize.maximum}*1024*1024;
+const char *rvm_version = "Jikes RVM ${rvm.version} (r${svn.revision})";
+const char *rvm_configuration = "${config.name}";
+const char *rvm_host_configuration = "${config.file}";
+const char *rvm_target_configuration = "${target.file}";
+
+
@@ -1535,11 +1547,7 @@ Check to make sure all required properties are specified. This includes properti
-
-
-
-
-
+
@@ -1551,138 +1559,311 @@ Check to make sure all required properties are specified. This includes properti
-
-
-
-
+ else="${bl.dir}/sysAlignmentCheck.c ${bl.dir}/sysConsole.c ${bl.dir}/sysIO.c ${bl.dir}/sysLibrary.c ${bl.dir}/sysMath.c ${bl.dir}/sysMemory.c ${bl.dir}/sysMisc.c ${bl.dir}/sysPerfCtr.c ${bl.dir}/sysThread.c ${bl.dir}/sysTime.c">
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/hosts/ia32-cygwin.properties b/build/hosts/ia32-cygwin.properties
index 95094edce..4676ef1fd 100755
--- a/build/hosts/ia32-cygwin.properties
+++ b/build/hosts/ia32-cygwin.properties
@@ -10,13 +10,13 @@
# See the COPYRIGHT.txt file distributed with this work for information
# regarding copyright ownership.
#
-bison.exe=c:/cygwin/bin/bison.exe
c.exe=c:/Program Files/Microsoft Visual Studio 9.0/VC/Bin/cl.exe
-c.args=/O2 /arch:SSE2 /nologo /Zi /DWIN32
+c.args= /nologo /O2 /arch:SSE2 /Zi
ld.exe=c:/Program Files/Microsoft Visual Studio 9.0/VC/Bin/link.exe
lib.exe=c:/Program Files/Microsoft Visual Studio 9.0/VC/Bin/lib.exe
+lib.args=/NOLOGO /subsystem:windows /NODEFAULTLIB:libcmt /NODEFAULTLIB:libc
mt.exe=c:/Program Files/Microsoft SDKs/Windows/v6.0A/bin/mt.exe
-shld.args=${c.args} /LD
+bison.exe=c:/cygwin/bin/bison.exe
perl.exe=c:/cygwin/bin/perl.exe
bash.exe=c:/cygwin/bin/bash.exe
diff --git a/build/hosts/x86_64-linux.properties b/build/hosts/x86_64-linux.properties
index 54a5f439e..d13644772 100644
--- a/build/hosts/x86_64-linux.properties
+++ b/build/hosts/x86_64-linux.properties
@@ -10,19 +10,20 @@
# See the COPYRIGHT.txt file distributed with this work for information
# regarding copyright ownership.
#
-bison.exe=/usr/bin/bison
-c++.exe=/usr/bin/g++
-c++.args=-w -pipe -ggdb3 -O -fPIC -m32
c.exe=/usr/bin/gcc
-c.args=${c++.args}
-shld.args=${c++.args} -shared
+c.args=-w -pipe -ggdb3 -O -fPIC -m32
+ld.exe=/usr/bin/ld
+bison.exe=/usr/bin/bison
+perl.exe=/usr/bin/perl
+bash.exe=/bin/bash
+
+# optional flags used in building Harmony
harmony.arch=x86
harmony.cflags=-m32
harmony.cxxflags=-m32
harmony.ldflags=-m32
harmony.asflags=--32
-perl.exe=/usr/bin/perl
-bash.exe=/bin/bash
+ant.exe=/usr/bin/ant
# optional unless downloading and installing classpath or gcspy
make.exe=/usr/bin/make
@@ -31,4 +32,3 @@ make.exe=/usr/bin/make
tar.exe=/bin/tar
cvs.exe=/usr/bin/cvs
autoconf.exe=/usr/bin/autoconf
-ant.exe=/usr/bin/ant
diff --git a/build/targets/ia32-linux.properties b/build/targets/ia32-linux.properties
index 5d34d9971..c115b4bd9 100644
--- a/build/targets/ia32-linux.properties
+++ b/build/targets/ia32-linux.properties
@@ -17,6 +17,8 @@ target.bootimage.data.address=0x57000000
target.bootimage.rmap.address=0x5E000000
target.max-mappable.address=0xa0000000
target.address.size=32
+target.obj-ext=.o
+target.obj-prefix=
target.dll-ext=.so
target.dll-prefix=lib
target.jni-suffix=${target.dll-ext}
diff --git a/build/targets/x86_64-linux.properties b/build/targets/x86_64-linux.properties
index 0a5101354..d92b4f74f 100644
--- a/build/targets/x86_64-linux.properties
+++ b/build/targets/x86_64-linux.properties
@@ -19,6 +19,10 @@ target.max-mappable.address=0xb0000000
target.address.size=32
target.dll-ext=.so
target.dll-prefix=lib
+target.lib-ext=
+target.lib-prefix=
+target.obj-ext=.o
+target.obj-prefix=
target.jni-suffix=${target.dll-ext}
target.arch.sse2=full
target.arch.hw_fsqrt=true
diff --git a/rvm/src/org/jikesrvm/runtime/DynamicLibrary.java b/rvm/src/org/jikesrvm/runtime/DynamicLibrary.java
index 3d4d6eef0..b83c6989b 100644
--- a/rvm/src/org/jikesrvm/runtime/DynamicLibrary.java
+++ b/rvm/src/org/jikesrvm/runtime/DynamicLibrary.java
@@ -36,7 +36,7 @@ public final class DynamicLibrary {
* Add symbol for the boot image runner to find symbols within it.
*/
public static void boot() {
- System.loadLibrary("rvmdynlib");
+ System.loadLibrary("jvm_jni");
}
/**