[vmkit-commits] [vmkit] r199086 - JAVA_HOME is ...../jre

[Gael Thomas]

Author: gthomas
Date: Mon Jan 13 03:47:56 2014
New Revision: 199086

URL: http://llvm.org/viewvc/llvm-project?rev=199086&view=rev
Log:
JAVA_HOME is ...../jre

Modified:
    vmkit/branches/mcjit/lib/j3/openjdk/j3lib.cc
    vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc

Modified: vmkit/branches/mcjit/lib/j3/openjdk/j3lib.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/openjdk/j3lib.cc?rev=199086&r1=199085&r2=199086&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/openjdk/j3lib.cc (original)
+++ vmkit/branches/mcjit/lib/j3/openjdk/j3lib.cc Mon Jan 13 03:47:56 2014
@@ -14,9 +14,9 @@
 using namespace j3;
 
 #ifdef LINUX_OS
-#define OPENJDK_LIBPATH_SUFFIX "jre/lib/amd64"
+#define OPENJDK_LIBPATH_SUFFIX "/lib/amd64"
 #else
-#define OPENJDK_LIBPATH_SUFFIX "jre/lib"
+#define OPENJDK_LIBPATH_SUFFIX "/lib"
 #endif
 
 static char* buildPath(const char* base, const char* suffix) {
@@ -32,12 +32,12 @@ static char* buildPath(const char* base,
 
 void J3Lib::processOptions(J3* vm) {
 	const char* jh = getenv("JAVA_HOME");
-	jh = jh ? jh : OPENJDK_HOME;
+	jh = jh ? jh : OPENJDK_HOME"/jre";
 
 	vm->options()->javaHome = jh ? jh : OPENJDK_HOME;
-	vm->options()->bootClasspath = buildPath(jh, "jre/lib/rt.jar");
+	vm->options()->bootClasspath = buildPath(jh, "/lib/rt.jar");
 	vm->options()->systemLibraryPath = buildPath(jh, OPENJDK_LIBPATH_SUFFIX);
-	vm->options()->extDirs = buildPath(jh, "jre/lib/ext");
+	vm->options()->extDirs = buildPath(jh, "/lib/ext");
 }
 
 void J3Lib::loadSystemLibraries(J3ClassLoader* loader) {

Modified: vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc?rev=199086&r1=199085&r2=199086&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc Mon Jan 13 03:47:56 2014
@@ -227,8 +227,6 @@ J3InitialClassLoader::J3InitialClassLoad
 	const char* archives = J3Thread::get()->vm()->options()->bootClasspath;
 	J3ClassBytes* bytes = J3Reader::openFile(allocator(), archives);
 
-	//makeLLVMFunctions_j3();
-
 	if (bytes) {
 		archive = new(allocator()) J3ZipArchive(bytes, allocator());
 		if(!archive) {