hg: jdk/sandbox: Merge

[ashipile at redhat.com]

Changeset: e629240491c7
Author:    shade
Date:      2018-04-10 11:14 +0200
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/e629240491c7

Merge

- make/hotspot/lib/CompileDtracePostJvm.gmk
- make/hotspot/lib/CompileDtracePreJvm.gmk
- make/hotspot/lib/CompileLibjsig.gmk
- make/hotspot/src/native/dtrace/generateJvmOffsets.h
- make/lib/SoundLibraries.gmk
- make/mapfiles/launchers/mapfile-ppc64
- make/mapfiles/launchers/mapfile-ppc64.anonymous
- make/mapfiles/launchers/mapfile-sparc
- make/mapfiles/launchers/mapfile-sparcv9
- make/mapfiles/launchers/mapfile-x86
- make/mapfiles/launchers/mapfile-x86.anonymous
- make/mapfiles/launchers/mapfile-x86_64
- make/mapfiles/launchers/mapfile-x86_64.anonymous
- make/mapfiles/libattach/mapfile-aix
- make/mapfiles/libattach/mapfile-linux
- make/mapfiles/libattach/mapfile-solaris
- make/mapfiles/libattach/reorder-windows-x86
- make/mapfiles/libattach/reorder-windows-x86_64
- make/mapfiles/libawt/mapfile-mawt-vers
- make/mapfiles/libawt/mapfile-vers
- make/mapfiles/libawt/mapfile-vers-linux
- make/mapfiles/libawt_headless/mapfile-vers
- make/mapfiles/libawt_headless/reorder-sparc
- make/mapfiles/libawt_headless/reorder-sparcv9
- make/mapfiles/libawt_headless/reorder-x86
- make/mapfiles/libawt_xawt/mapfile-vers
- make/mapfiles/libdt_socket/mapfile-vers
- make/mapfiles/libextnet/mapfile-linux
- make/mapfiles/libextnet/mapfile-solaris
- make/mapfiles/libfontmanager/mapfile-vers
- make/mapfiles/libinstrument/mapfile-vers
- make/mapfiles/libj2gss/mapfile-vers
- make/mapfiles/libj2pcsc/mapfile-vers
- make/mapfiles/libj2pkcs11/mapfile-vers
- make/mapfiles/libj2ucrypto/mapfile-vers
- make/mapfiles/libjaas/mapfile-vers
- make/mapfiles/libjava/mapfile-vers
- make/mapfiles/libjava/reorder-sparc
- make/mapfiles/libjava/reorder-sparcv9
- make/mapfiles/libjava/reorder-x86
- make/mapfiles/libjawt/mapfile-vers
- make/mapfiles/libjdwp/mapfile-vers
- make/mapfiles/libjimage/mapfile-vers
- make/mapfiles/libjli/mapfile-vers
- make/mapfiles/libjpeg/mapfile-vers
- make/mapfiles/libjpeg/reorder-sparc
- make/mapfiles/libjpeg/reorder-sparcv9
- make/mapfiles/libjpeg/reorder-x86
- make/mapfiles/libjsdt/mapfile-vers
! make/mapfiles/libjsig/mapfile-vers-solaris
- make/mapfiles/liblcms/mapfile-vers
- make/mapfiles/libmanagement/mapfile-vers
- make/mapfiles/libmanagement_agent/mapfile-vers
- make/mapfiles/libmanagement_ext/mapfile-vers
- make/mapfiles/libmlib_image/mapfile-vers
- make/mapfiles/libnet/mapfile-vers
- make/mapfiles/libnio/mapfile-aix
- make/mapfiles/libnio/mapfile-linux
- make/mapfiles/libnio/mapfile-macosx
- make/mapfiles/libnio/mapfile-solaris
- make/mapfiles/libnio/reorder-sparc
- make/mapfiles/libnio/reorder-sparcv9
- make/mapfiles/libnio/reorder-x86
- make/mapfiles/libprefs/mapfile-vers
- make/mapfiles/librmi/mapfile-vers
- make/mapfiles/libsaproc/mapfile-linux
- make/mapfiles/libsaproc/mapfile-macosx
- make/mapfiles/libsaproc/mapfile-solaris
- make/mapfiles/libsctp/mapfile-vers
- make/mapfiles/libsplashscreen/mapfile-vers
- make/mapfiles/libsunec/mapfile-vers
- make/mapfiles/libunpack/mapfile-vers
- make/mapfiles/libunpack/mapfile-vers-unpack200
- make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc
- make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86
- make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous
- make/mapfiles/libverify/mapfile-vers
- make/mapfiles/libverify/reorder-sparc
- make/mapfiles/libverify/reorder-sparcv9
- make/mapfiles/libverify/reorder-x86
- make/mapfiles/libzip/mapfile-vers
- make/mapfiles/libzip/reorder-sparc
- make/mapfiles/libzip/reorder-sparcv9
- make/mapfiles/libzip/reorder-x86
- src/bsd/doc/man/ja/javah.1
- src/bsd/doc/man/javah.1
! src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
! src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
! src/hotspot/cpu/arm/stubGenerator_arm.cpp
! src/hotspot/cpu/arm/templateTable_arm.cpp
! src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
! src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
! src/hotspot/cpu/s390/stubGenerator_s390.cpp
! src/hotspot/cpu/s390/templateTable_s390.cpp
! src/hotspot/cpu/sparc/stubGenerator_sparc.cpp
! src/hotspot/cpu/sparc/templateTable_sparc.cpp
! src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
! src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
! src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
! src/hotspot/share/c1/c1_LIRGenerator.cpp
- src/hotspot/share/gc/cms/parCardTableModRefBS.cpp
! src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp
! src/hotspot/share/gc/shared/barrierSet.hpp
- src/hotspot/share/gc/shared/barrierSet.inline.hpp
! src/hotspot/share/gc/shared/barrierSetConfig.hpp
! src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
- src/hotspot/share/gc/shared/cardTableModRefBS.cpp
- src/hotspot/share/gc/shared/cardTableModRefBS.hpp
- src/hotspot/share/gc/shared/cardTableModRefBS.inline.hpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/precompiled/precompiled.hpp
- src/hotspot/share/prims/jvmtiEnter.hpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/globals.cpp
! src/hotspot/share/runtime/globals.hpp
- src/hotspot/share/runtime/interfaceSupport.hpp
- src/hotspot/share/services/serviceUtil.hpp
- src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/TraceInliningMode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotArithmeticLIRGenerator.java
- src/linux/doc/man/ja/javah.1
- src/linux/doc/man/javah.1
- src/solaris/doc/sun/man/man1/ja/javah.1
- src/solaris/doc/sun/man/man1/javah.1
! test/hotspot/jtreg/TEST.groups
- test/jdk/java/lang/SecurityManager/DepMethodsRequireAllPerm.java
- test/jdk/java/nio/channels/SocketChannel/IsConnectable.java
- test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.sh
- test/jdk/sun/security/mscapi/KeytoolChangeAlias.sh
- test/jdk/sun/security/mscapi/PublicKeyInterop.sh
- test/jdk/sun/security/mscapi/RSAEncryptDecrypt.sh
- test/jdk/sun/security/mscapi/ShortRSAKey1024.sh
- test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.sh
- test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh
- test/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java
- test/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out
- test/tools/javac/importChecks/ImportCanonicalSameName/p1/A.java
- test/tools/javac/importChecks/ImportCanonicalSameName/p2/A.java