changeset 50558:52b866a1a63a

Merge
author bobv
date Tue, 12 Jun 2018 18:53:38 -0400
parents 292a4a87c321 a18c60527166
children a1a3d41b6c13
files make/BuildNashorn.gmk make/UnpackSecurity.gmk 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/runtime/orderAccess.inline.hpp src/java.base/aix/native/libjsig/jsig.c src/java.base/share/classes/sun/launcher/LauncherHelper.java src/java.base/share/classes/sun/launcher/resources/launcher.properties src/java.desktop/linux/conf/oblique-fonts/fonts.dir src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h src/java.desktop/share/classes/sun/applet/AppletEvent.java src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java src/java.desktop/share/classes/sun/applet/AppletIOException.java src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java src/java.desktop/share/classes/sun/applet/AppletImageRef.java src/java.desktop/share/classes/sun/applet/AppletListener.java src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java src/java.desktop/share/classes/sun/applet/AppletPanel.java src/java.desktop/share/classes/sun/applet/AppletProps.java src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java src/java.desktop/share/classes/sun/applet/AppletSecurityException.java src/java.desktop/share/classes/sun/applet/AppletViewer.java src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java src/java.desktop/share/classes/sun/applet/Main.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java src/java.desktop/share/classes/sun/print/DialogOnTop.java src/java.desktop/share/classes/sun/print/DialogOwner.java src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh src/java.desktop/unix/conf/fonts/fonts.dir src/java.sql.rowset/share/classes/javax/sql/rowset/package.html src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/StringTable.java 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 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/TEST.ROOT test/jdk/java/lang/Thread/StopThrowable.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 test/jdk/javax/swing/JLayer/8041982/cupanim.gif test/jdk/javax/swing/JSlider/4987336/cupanim.gif test/jdk/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java test/jdk/sun/applet/TEST.properties
diffstat 2804 files changed, 230468 insertions(+), 45553 deletions(-) [+]