# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1433795524 -7200
# Node ID 1c22030625eb8779f818cf27ab45af8036e355c8
# Parent  5d589f7383a640834e645c16e2aaad98a75f225f
moved putting truffle.jar on the boot class path from the VM to mx (JBS:GRAAL-53)

diff -r 5d589f7383a6 -r 1c22030625eb mx/mx_graal.py
--- a/mx/mx_graal.py	Mon Jun 08 22:21:12 2015 +0200
+++ b/mx/mx_graal.py	Mon Jun 08 22:32:04 2015 +0200
@@ -1137,9 +1137,11 @@
         if  len(ignoredArgs) > 0:
             mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs))
 
-    if vm == 'original':
-        truffle_jar = mx.archive(['@TRUFFLE'])[0]
-        args = ['-Xbootclasspath/p:' + truffle_jar] + args
+    # Unconditionally prepend Truffle to the boot class path.
+    # This used to be done by the VM itself but was removed to
+    # separate the VM from Truffle.
+    truffle_jar = mx.archive(['@TRUFFLE'])[0]
+    args = ['-Xbootclasspath/p:' + truffle_jar] + args
 
     args = mx.java().processArgs(args)
     return (pfx, exe, vm, args, cwd)
diff -r 5d589f7383a6 -r 1c22030625eb src/share/vm/runtime/os.cpp
--- a/src/share/vm/runtime/os.cpp	Mon Jun 08 22:21:12 2015 +0200
+++ b/src/share/vm/runtime/os.cpp	Mon Jun 08 22:32:04 2015 +0200
@@ -1192,9 +1192,6 @@
 #ifdef JVMCI
         "%/lib/jvmci-service.jar:"
 #endif
-#ifndef NO_TRUFFLE_JAR
-        "%/lib/truffle.jar:"
-#endif
         "%/classes";
     char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
     if (sysclasspath == NULL) return false;