hg: jdk/sandbox: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: f0d5c39dfbc1
Author:    ihse
Date:      2018-06-07 10:48 +0200
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/f0d5c39dfbc1

Merge

- make/BuildNashorn.gmk
- make/UnpackSecurity.gmk
! make/common/NativeCompilation.gmk
! make/launcher/Launcher-jdk.pack.gmk
! make/launcher/LauncherCommon.gmk
! make/lib/Awt2dLibraries.gmk
! make/lib/CoreLibraries.gmk
! make/lib/Lib-jdk.net.gmk
! make/lib/LibCommon.gmk
- src/hotspot/os/aix/jvm_aix.cpp
- src/hotspot/os/bsd/jvm_bsd.cpp
- src/hotspot/os/linux/jvm_linux.cpp
- src/hotspot/os/solaris/jvm_solaris.cpp
- src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.inline.hpp
- src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.inline.hpp
- src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.inline.hpp
- src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.inline.hpp
- src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp
- src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.inline.hpp
- src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.inline.hpp
- src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.inline.hpp
- src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.inline.hpp
- src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.inline.hpp
- src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.inline.hpp
- src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.inline.hpp
- src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.inline.hpp
! src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
- src/hotspot/share/memory/metachunk.cpp
- src/hotspot/share/memory/metachunk.hpp
! src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
! src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
! src/hotspot/share/runtime/flags/jvmFlagRangeList.cpp
! src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp
- src/hotspot/share/runtime/orderAccess.inline.hpp
- src/hotspot/share/runtime/vmStructs_trace.hpp
- src/hotspot/share/trace/noTraceBackend.hpp
- src/hotspot/share/trace/trace.dtd
- src/hotspot/share/trace/trace.xml
- src/hotspot/share/trace/traceBackend.cpp
- src/hotspot/share/trace/traceBackend.hpp
- src/hotspot/share/trace/traceDataTypes.hpp
- src/hotspot/share/trace/traceEvent.hpp
- src/hotspot/share/trace/traceEventClasses.xsl
- src/hotspot/share/trace/traceEventIds.xsl
- src/hotspot/share/trace/traceMacros.hpp
- src/hotspot/share/trace/traceStream.cpp
- src/hotspot/share/trace/traceStream.hpp
- src/hotspot/share/trace/traceTime.hpp
- src/hotspot/share/trace/traceTypes.xsl
- src/hotspot/share/trace/traceevents.xml
- src/hotspot/share/trace/tracerelationdecls.xml
- src/hotspot/share/trace/tracetypes.xml
- src/hotspot/share/trace/tracing.hpp
- src/hotspot/share/trace/tracingExport.cpp
- src/hotspot/share/trace/tracingExport.hpp
- src/hotspot/share/trace/xinclude.mod
- src/hotspot/share/trace/xsl_util.xsl
- src/hotspot/share/utilities/ticks.inline.hpp
- src/java.base/macosx/conf/x86_64/jvm.cfg
- src/java.base/unix/conf/aarch64/jvm.cfg
- src/java.base/unix/conf/amd64/jvm.cfg
- src/java.base/unix/conf/arm/jvm.cfg
- src/java.base/unix/conf/i586/jvm.cfg
- src/java.base/unix/conf/ia64/jvm.cfg
- src/java.base/unix/conf/ppc64/jvm.cfg
- src/java.base/unix/conf/ppc64le/jvm.cfg
- src/java.base/unix/conf/s390x/jvm.cfg
- src/java.base/unix/conf/sparc/jvm.cfg
- src/java.base/unix/conf/sparcv9/jvm.cfg
- src/java.base/unix/conf/zero/jvm.cfg
- src/java.base/windows/conf/amd64/jvm.cfg
- src/java.base/windows/conf/i586/jvm.cfg
- src/java.base/windows/conf/ia64/jvm.cfg
- src/java.desktop/linux/conf/oblique-fonts/fonts.dir
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh
- src/java.desktop/unix/conf/fonts/fonts.dir
- src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionException.java
- src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnacceptableNumberOfNonOptionsException.java
- src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Objects.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugValueMap.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/aaa
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/META-INF/services/javax.annotation.processing.Processor
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/APHotSpotSignature.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/AbstractVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/FoldVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedFoldPlugin.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedNodeIntrinsicPlugin.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/GeneratedPlugin.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/InjectedDependencies.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/MethodSubstitutionVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/NodeIntrinsicVerifier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/PluginGenerator.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/VerifierAnnotationProcessor.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/D
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.10.2.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseExecutableMemberTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseInlineTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/HiddenTaglet.java
! src/jdk.net/linux/native/libextnet/LinuxSocketOptions.c
- test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsHelper.java
- test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java
- test/hotspot/jtreg/runtime/appcds/test-classes/jdk/dynalink/DynamicLinker.jasm
- test/jdk/java/lang/Character/Blocks.txt
- test/jdk/java/lang/Character/CheckBlocks.java
- test/jdk/java/lang/Character/TestISOControls.java
- test/jdk/javax/sound/midi/MidiSystem/DefaultProperties.java
- test/jdk/javax/sound/midi/MidiSystem/testdata/conf/sound.properties
- test/jdk/javax/sound/sampled/AudioSystem/DefaultProperties.java
- test/jdk/javax/sound/sampled/AudioSystem/testdata/conf/sound.properties