Mercurial > hg > graal-jvmci-8
changeset 23320:d9ae6a4319be
add support for MX_ALT_OUTPUT_ROOT
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 11 Mar 2016 16:53:36 +0100 |
parents | c1935b089c01 |
children | fc1036575a76 |
files | jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/SourceStackTrace.java make/bsd/makefiles/vm.make make/linux/makefiles/vm.make make/solaris/makefiles/vm.make make/windows/makefiles/projectcreator.make mx.jvmci/suite.py |
diffstat | 6 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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.
--- 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.
--- 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.
--- 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=\