stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8146660: Resolve merge issue in resulting from sun.misc.VM move to jdk.internal.misc

Browse Source 
Reviewed-by: twisti, erikj, chegar
This commit is contained in:
Alejandro Murillo 2016-01-13 12:45:36 -08:00
parent 640cf07750
commit d1460d5224
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hotspot/make/gensrc/Gensrc-jdk.vm.ci.gmk
View File

@ -69,6 +69,7 @@ $(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) \
$(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files)) $(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
$(JAVA_SMALL) $(NEW_JAVAC) \ $(JAVA_SMALL) $(NEW_JAVAC) \
-XDignore.symbol.file \ -XDignore.symbol.file \
-bootclasspath $(JDK_OUTPUTDIR)/modules/java.base \
-sourcepath $(SOURCEPATH) \ -sourcepath $(SOURCEPATH) \
-implicit:none \ -implicit:none \
-proc:only \ -proc:only \

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
View File

@ -49,7 +49,7 @@ import jdk.vm.ci.runtime.JVMCI;
import jdk.vm.ci.runtime.JVMCIBackend; import jdk.vm.ci.runtime.JVMCIBackend;
import jdk.vm.ci.runtime.JVMCICompiler; import jdk.vm.ci.runtime.JVMCICompiler;
import jdk.vm.ci.service.Services; import jdk.vm.ci.service.Services;
import sun.misc.VM; import jdk.internal.misc.VM;
//JaCoCo Exclude //JaCoCo Exclude