hg: amber/amber: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Tue Apr 10 17:26:09 UTC 2018
Changeset: cd56311735af
Author: mcimadamore
Date: 2018-04-10 19:26 +0200
URL: http://hg.openjdk.java.net/amber/amber/rev/cd56311735af
Automatic merge with default
- 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/libjsoundalsa/mapfile-vers
- 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/share/gc/cms/parCardTableModRefBS.cpp
- src/hotspot/share/gc/g1/g1AllocationContext.hpp
- src/hotspot/share/gc/g1/g1Allocator_ext.cpp
- src/hotspot/share/gc/g1/g1CollectedHeap_ext.cpp
- src/hotspot/share/gc/g1/g1DefaultPolicy.cpp
- src/hotspot/share/gc/g1/g1DefaultPolicy.hpp
- src/hotspot/share/gc/g1/g1FullCollector_ext.cpp
- src/hotspot/share/gc/g1/g1ParScanThreadState_ext.cpp
- src/hotspot/share/gc/g1/g1RootClosures_ext.cpp
- src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.cpp
- src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.hpp
- src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.inline.hpp
- src/hotspot/share/gc/shared/barrierSet.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/cardTableModRefBSForCTRS.hpp
- src/hotspot/share/memory/universe.inline.hpp
- src/hotspot/share/prims/jvmtiEnter.hpp
- src/hotspot/share/prims/whitebox_ext.cpp
- src/hotspot/share/runtime/interfaceSupport.hpp
- src/hotspot/share/runtime/thread_ext.cpp
- src/hotspot/share/runtime/thread_ext.hpp
- src/hotspot/share/runtime/vmStructs_ext.hpp
- src/hotspot/share/services/serviceUtil.hpp
- src/java.base/linux/classes/sun/nio/ch/EPollArrayWrapper.java
- src/java.base/linux/native/libnio/ch/EPollArrayWrapper.c
- src/java.base/linux/native/libnio/ch/EPollPort.c
- src/java.base/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java
- src/java.base/macosx/native/libnio/ch/KQueueArrayWrapper.c
- src/java.base/macosx/native/libnio/ch/KQueuePort.c
! src/java.base/share/classes/java/lang/String.java
- src/java.base/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java
- src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java
- src/java.base/share/classes/sun/nio/ch/PollSelectorProvider.java
- src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java
- src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java
- src/java.base/unix/classes/sun/nio/ch/PollArrayWrapper.java
- src/java.base/unix/native/libnio/ch/PollArrayWrapper.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h
- src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiIn.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiOut.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h
- src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h
- src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_Ports.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h
- src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h
- src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h
- src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_PCM.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Ports.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.c
- src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.h
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- src/jdk.hotspot.agent/linux/native/libsaproc/test.c
- src/jdk.hotspot.agent/macosx/native/libsaproc/BsdDebuggerLocal.c
- src/jdk.hotspot.agent/macosx/native/libsaproc/StubDebuggerLocal.c
- src/jdk.hotspot.agent/macosx/native/libsaproc/ps_proc.c
- src/jdk.hotspot.agent/macosx/native/libsaproc/salibelf.c
- src/jdk.hotspot.agent/macosx/native/libsaproc/test.c
- src/jdk.hotspot.agent/solaris/native/libsaproc/saproc_audit.cpp
- 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/gtest/memory/test_chunkManager.cpp
- test/hotspot/gtest/runtime/test_threadstack_tracking.cpp
- test/hotspot/jtreg/compiler/aot/TEST.properties
- test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java
- test/jdk/java/io/ByteArrayOutputStream/WriteBounds.java
- test/jdk/java/lang/SecurityManager/DepMethodsRequireAllPerm.java
- test/jdk/java/nio/channels/DatagramChannel/SendToUnresolved.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/langtools/tools/javac/TryWithResources/TwrShareCloseCode.java
- 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
More information about the amber-dev
mailing list