# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1436980588 25200
# Node ID 4a500b3783fb3d1efd55bce7a5866277ce30c30e
# Parent  a85ef0434dbaac66d23b49e92f6da0af3456e3b7# Parent  a05f318a4a087ba0c9011102ee188829230c8ee2
Merge

diff -r a85ef0434dba -r 4a500b3783fb CHANGELOG.md
--- a/CHANGELOG.md	Wed Jul 15 09:49:14 2015 -0700
+++ b/CHANGELOG.md	Wed Jul 15 10:16:28 2015 -0700
@@ -11,6 +11,9 @@
 * Add support for constructing low-level IR in SSA form (default behavior).
 * Add support for SSA linear scan register allocation (default behavior).
 * Remove dummy parameter `includeAbstract` from `ResolvedJavaType#resolveMethod()`; The behavior is now the `includeAbstract==true` case. The `includeAbstract==false` variant is available via `resolveConcreteMethod()`.
+* HotSpot modifications have been renamed to JVMCI in preparation for [JEP 243](http://openjdk.java.net/jeps/243). As a result HotSpot options containing "Graal" have been changed to "JVMCI" (e.g., -XX:+BootstrapJVMCI).
+* All the APIs used to interface with the VM (`api.meta`, `api.code` etc.) have been moved to `jdk.internal.jvmci` packages (e.g., `jdk.internal.jvmci.meta`).
+* Fast JVMCI services do not need to implement an interface anymore, implementations simply need to be annotated with `jdk.internal.jvmci.service.ServiceProvider`.
 
 ### Truffle
 * Moved Truffle to it own [repository](http://lafo.ssw.uni-linz.ac.at/hg/truffle/)
diff -r a85ef0434dba -r 4a500b3783fb mx.graal/mx_graal_makefile.py
--- a/mx.graal/mx_graal_makefile.py	Wed Jul 15 09:49:14 2015 -0700
+++ b/mx.graal/mx_graal_makefile.py	Wed Jul 15 10:16:28 2015 -0700
@@ -55,8 +55,7 @@
     if opts.selectedDists == None or len(opts.selectedDists) == 0:
         opts.selectedDists = [d.name for d in mx_graal._jdkDeployedDists if d.partOfHotSpot]
     mf = Makefile()
-    commandline = " ".join(["mx.sh", "makefile"] + args)
-    if do_build_makefile(mf, opts.selectedDists, commandline):
+    if do_build_makefile(mf, opts.selectedDists):
         contents = mf.generate()
         if opts.output == None:
             print contents
@@ -153,7 +152,7 @@
 
 
 
-def do_build_makefile(mf, selectedDists, commandline):
+def do_build_makefile(mf, selectedDists):
     java = mx.java()
     bootClassPath = java.bootclasspath()
     bootClassPath = bootClassPath.replace(os.path.realpath(java.jdk), "$(ABS_BOOTDIR)")