Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8146660: Resolve merge issue in resulting from sun.misc.VM move to jdk.internal.misc
authoramurillo
Wed, 13 Jan 2016 12:45:36 -0800
changeset 35234 854fc566323e
parent 35233 357bf863e7c1
child 35235 5e373cc222a5
child 35495 e27da438fa13
8146660: Resolve merge issue in resulting from sun.misc.VM move to jdk.internal.misc Reviewed-by: twisti, erikj, chegar
hotspot/make/gensrc/Gensrc-jdk.vm.ci.gmk file | annotate | diff | comparison | revisions
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java file | annotate | diff | comparison | revisions 
--- a/hotspot/make/gensrc/Gensrc-jdk.vm.ci.gmk	Tue Jan 12 11:31:47 2016 -0800
+++ b/hotspot/make/gensrc/Gensrc-jdk.vm.ci.gmk	Wed Jan 13 12:45:36 2016 -0800
@@ -69,6 +69,7 @@
 	$(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
 	$(JAVA_SMALL) $(NEW_JAVAC) \
 	    -XDignore.symbol.file \
+            -bootclasspath $(JDK_OUTPUTDIR)/modules/java.base \
 	    -sourcepath $(SOURCEPATH) \
 	    -implicit:none \
 	    -proc:only \
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java	Tue Jan 12 11:31:47 2016 -0800
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java	Wed Jan 13 12:45:36 2016 -0800
@@ -49,7 +49,7 @@
 import jdk.vm.ci.runtime.JVMCIBackend;
 import jdk.vm.ci.runtime.JVMCICompiler;
 import jdk.vm.ci.service.Services;
-import sun.misc.VM;
+import jdk.internal.misc.VM;
 
 //JaCoCo Exclude
jdk-sandbox