# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1457711616 -3600
# Node ID d9ae6a4319beb176eb738a30d817c8185b6a1d8f
# Parent  c1935b089c01b0d70af7cce8da9053fd631ef4c1
add support for MX_ALT_OUTPUT_ROOT

diff -r c1935b089c01 -r d9ae6a4319be jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/SourceStackTrace.java
--- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/SourceStackTrace.java	Fri Mar 11 16:00:25 2016 +0100
+++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/SourceStackTrace.java	Fri Mar 11 16:53:36 2016 +0100
@@ -36,7 +36,7 @@
             private static final long serialVersionUID = 6279381376051787907L;
 
             @Override
-            public final synchronized Throwable fillInStackTrace() {
+            public synchronized Throwable fillInStackTrace() {
                 assert elements != null;
                 setStackTrace(elements);
                 return this;
diff -r c1935b089c01 -r d9ae6a4319be make/bsd/makefiles/vm.make
--- a/make/bsd/makefiles/vm.make	Fri Mar 11 16:00:25 2016 +0100
+++ b/make/bsd/makefiles/vm.make	Fri Mar 11 16:53:36 2016 +0100
@@ -216,6 +216,7 @@
 else
   JVMCI_SPECIFIC_FILES   :=
   Src_Dirs_I += $(HS_COMMON_SRC)/../mxbuild/jvmci/jdk.vm.ci.hotspot/src_gen/hotspot
+  Src_Dirs_I += $(MX_ALT_OUTPUT_ROOT)/jvmci/jvmci/jdk.vm.ci.hotspot/src_gen/hotspot
 endif
 
 # Always exclude these.
diff -r c1935b089c01 -r d9ae6a4319be make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make	Fri Mar 11 16:00:25 2016 +0100
+++ b/make/linux/makefiles/vm.make	Fri Mar 11 16:53:36 2016 +0100
@@ -201,6 +201,7 @@
 else
   JVMCI_SPECIFIC_FILES   :=
   Src_Dirs_I += $(HS_COMMON_SRC)/../mxbuild/jvmci/jdk.vm.ci.hotspot/src_gen/hotspot
+  Src_Dirs_I += $(MX_ALT_OUTPUT_ROOT)/jvmci/jvmci/jdk.vm.ci.hotspot/src_gen/hotspot
 endif
 
 # Always exclude these.
diff -r c1935b089c01 -r d9ae6a4319be make/solaris/makefiles/vm.make
--- a/make/solaris/makefiles/vm.make	Fri Mar 11 16:00:25 2016 +0100
+++ b/make/solaris/makefiles/vm.make	Fri Mar 11 16:53:36 2016 +0100
@@ -212,6 +212,7 @@
 else
   JVMCI_SPECIFIC_FILES   :=
   Src_Dirs_I += $(HS_COMMON_SRC)/../mxbuild/jvmci/jdk.vm.ci.hotspot/src_gen/hotspot
+  Src_Dirs_I += $(MX_ALT_OUTPUT_ROOT)/jvmci/jvmci/jdk.vm.ci.hotspot/src_gen/hotspot
 endif
 
 # Always exclude these.
diff -r c1935b089c01 -r d9ae6a4319be make/windows/makefiles/projectcreator.make
--- a/make/windows/makefiles/projectcreator.make	Fri Mar 11 16:00:25 2016 +0100
+++ b/make/windows/makefiles/projectcreator.make	Fri Mar 11 16:53:36 2016 +0100
@@ -57,6 +57,7 @@
         -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \
         -relativeInclude src\cpu\$(Platform_arch)\vm \
         -relativeInclude mxbuild\jvmci\jdk.vm.ci.hotspot\src_gen\hotspot \
+        -relativeInclude $(MX_ALT_OUTPUT_ROOT)\jvmci\jvmci\jdk.vm.ci.hotspot\src_gen\hotspot \
         -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \
         -relativeSrcInclude src \
         -absoluteSrcInclude $(HOTSPOTBUILDSPACE) \
@@ -153,6 +154,7 @@
 ProjectCreatorIDEOptionsIgnoreJVMCI=\
  -ignorePath_TARGET src/share/vm/jvmci \
  -ignorePath_TARGET mxbuild/jvmci/jdk.vm.ci.hotspot/src_gen/hotspot \
+ -ignorePath_TARGET $(MX_ALT_OUTPUT_ROOT)/jvmci/jdk.vm.ci.hotspot/src_gen/hotspot \
  -ignorePath_TARGET vm/jvmci
 
 ProjectCreatorIDEOptionsIgnoreCompiler2=\
diff -r c1935b089c01 -r d9ae6a4319be mx.jvmci/suite.py
--- a/mx.jvmci/suite.py	Fri Mar 11 16:00:25 2016 +0100
+++ b/mx.jvmci/suite.py	Fri Mar 11 16:53:36 2016 +0100
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "5.5.7",
+  "mxversion" : "5.12.0",
   "name" : "jvmci",
   "url" : "http://openjdk.java.net/projects/graal",
   "developer" : {