Merge
authorcoleenp
Wed, 08 Nov 2017 16:03:35 -0500
changeset 47813 fedbf1b866a7
parent 47812 b140fe4ff916 (diff)
parent 47811 d76a6042f5d7 (current diff)
child 47814 19fad4c04a15
Merge
src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java
src/java.desktop/unix/legal/fontconfig.md
src/java.desktop/unix/native/common/awt/fontconfig.h
src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java
src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java
src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java
src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopySnippets.java
src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/DivNode.java
src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BasicIdealGraphPrinter.java
src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/IdealGraphPrinter.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Constants.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Generator.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Main.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Resources.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java
src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java
test/jdk/com/sun/awt/Translucency/WindowOpacity.java
test/jdk/javax/swing/JTextPane/bug8025082.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/Agent.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/AgentServer.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/AgentServerImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/Apple.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleUser.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/Callback.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/ComputeServerImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/CountInterface.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/DayTimeInterface.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/DayTimeServerImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/G1.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/G1Impl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/MyObject.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/MyObjectImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/NotActivatableInterface.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/NotActivatableServerImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/Orange.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeEcho.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeEchoImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/Server.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/ServerImpl.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/Task.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/TestInterface.java
test/jdk/sun/rmi/rmic/newrmic/equivalence/batch.sh
test/jdk/sun/rmi/rmic/newrmic/equivalence/run.sh
test/langtools/tools/javac/diags/examples/PatchModuleWithRelease/PatchModuleWithRelease.java
test/langtools/tools/javac/diags/examples/PatchModuleWithRelease/patchmodule/java.base/java/lang/Test.java
--- a/src/hotspot/share/runtime/init.cpp	Wed Nov 08 09:03:24 2017 -0800
+++ b/src/hotspot/share/runtime/init.cpp	Wed Nov 08 16:03:35 2017 -0500
@@ -60,7 +60,11 @@
 jint universe_init();          // depends on codeCache_init and stubRoutines_init
 #if INCLUDE_ALL_GCS
 // depends on universe_init, must be before interpreter_init (currently only on SPARC)
+#ifndef ZERO
 void g1_barrier_stubs_init() NOT_SPARC({});
+#else
+void g1_barrier_stubs_init() {};
+#endif
 #endif
 void interpreter_init();       // before any methods loaded
 void invocationCounter_init(); // before any methods loaded