hg: jdk/submit: Merge

[thomas.stuefe at gmail.com]

Changeset: 13598794b0dd
Author:    stuefe
Date:      2018-06-07 22:44 +0200
URL:       http://hg.openjdk.java.net/jdk/submit/rev/13598794b0dd

Merge

- 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/prims/jvm.cpp
- src/hotspot/share/runtime/orderAccess.inline.hpp
- 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/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.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/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