Bootloader build fixes.

codehaus · Apr 7, 2009 · 1c4796a · 1c4796a
1 parent 99ca0bf
commit 1c4796a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/build.xml b/build.xml
@@ -1666,8 +1666,8 @@ const char *rvm_target_configuration = "${target.file}";
         </not>
       </conditions>
       <sequential>
-        <exec executable="${ld.exe}" failonerror="true">
-          <arg line="-m elf_i386 -shared"/>
+        <exec executable="${c.exe}" failonerror="true">
+          <arg line="${c.args} -shared"/>
           <arg value="--version-script=@{srcdir}/${target.dll-prefix}@{dllname}.exp"/>
           <arg line="-o @{outdir}/${target.dll-prefix}@{dllname}${target.dll-ext}"/>
           <arg value="-L@{outdir}"/>
@@ -1727,7 +1727,7 @@ const char *rvm_target_configuration = "${target.file}";
           <arg value="-L@{outdir}"/>
           <arg value="-L${harmony.lib.dir}"/>
           <ObjectFiles/>
-          <arg line="-lm -lc -ljvm"/>
+          <arg line="-ljvm -lm -lc"/>
 	  <arg line="-lpthread -ldl -lrt"/>
 <!--	  <arg line="-lvmi -lhythr -lhyprt -lhyarchive -lhyzlib"/> -->
         </exec>

diff --git a/tools/bootloader/libjvm.exp b/tools/bootloader/libjvm.exp
@@ -1,5 +1,7 @@
 JVM_0.1 {
   global :
+    SysTraceFile;
+    SysErrorFile;
     JavaArgc;
     JavaArgs;
     Me;