[vmkit-commits] [vmkit] r145303 - in /vmkit/trunk/lib/j3/ClassLib: GNUClasspath/ClasspathVMSystemProperties.inc OpenJDK/OpenJDK.inc SetProperties.inc

[Will Dietz]

Author: wdietz2
Date: Mon Nov 28 16:43:49 2011
New Revision: 145303

URL: http://llvm.org/viewvc/llvm-project?rev=145303&view=rev
Log:
Refactor the java.compiler property to ClassLib-specific locations.

OpenJDK doesn't support compiling code yet, so setting this value to 'gcj'
causes code to emit a warning that it can't find the specified compiler.

This is particularly important because this causes some dacapo failures due to
checksums on stderr output.

Modified:
    vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMSystemProperties.inc
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
    vmkit/trunk/lib/j3/ClassLib/SetProperties.inc

Modified: vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMSystemProperties.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMSystemProperties.inc?rev=145303&r1=145302&r2=145303&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMSystemProperties.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMSystemProperties.inc Mon Nov 28 16:43:49 2011
@@ -40,6 +40,11 @@
 
   setProperties(prop);
 
+  Jnjvm* vm = JavaThread::get()->getJVM();
+  const char * tmp = getenv("JAVA_COMPILER");
+  if (!tmp) tmp = "gcj";
+  setProperty(vm, prop, "java.compiler", tmp);
+
   END_NATIVE_EXCEPTION
 }
 

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=145303&r1=145302&r2=145303&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Mon Nov 28 16:43:49 2011
@@ -248,6 +248,11 @@
   setProperties(prop);
   setCommandLineProperties(prop);
 
+  Jnjvm* vm = JavaThread::get()->getJVM();
+  const char * tmp = getenv("JAVA_COMPILER");
+  if (tmp)
+    setProperty(vm, prop, "java.compiler", tmp);
+
   RETURN_FROM_JNI(p);
 
   END_JNI_EXCEPTION

Modified: vmkit/trunk/lib/j3/ClassLib/SetProperties.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/SetProperties.inc?rev=145303&r1=145302&r2=145303&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/SetProperties.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/SetProperties.inc Mon Nov 28 16:43:49 2011
@@ -66,9 +66,6 @@
   setProperty(vm, prop, "java.specification.version", "1.5");
   setProperty(vm, prop, "java.io.tmpdir", "/tmp");
 
-  tmp = getenv("JAVA_COMPILER");
-  if (!tmp) tmp = "gcj";
-  setProperty(vm, prop, "java.compiler", tmp);
 
   setProperty(vm, prop, "build.compiler", "gcj");
   setProperty(vm, prop, "gcj.class.path", JCL->bootClasspathEnv);