hg: panama/dev: manual merge with default
sandhya.viswanathan at intel.com
sandhya.viswanathan at intel.com
Mon May 4 23:56:27 UTC 2020
Changeset: b3dd6ce46afa
Author: sviswanathan
Date: 2020-05-04 16:53 -0700
URL: https://hg.openjdk.java.net/panama/dev/rev/b3dd6ce46afa
manual merge with default
- make/common/SetupJavaCompilers.gmk
- make/copy/Copy-java.base.gmk
- make/copy/Copy-java.desktop.gmk
- make/copy/Copy-java.logging.gmk
- make/copy/Copy-jdk.accessibility.gmk
- make/copy/Copy-jdk.crypto.cryptoki.gmk
- make/copy/Copy-jdk.crypto.ucrypto.gmk
- make/copy/Copy-jdk.jdwp.agent.gmk
- make/copy/Copy-jdk.jfr.gmk
- make/copy/Copy-jdk.management.agent.gmk
- make/copy/CopyCommon.gmk
- make/data/cacerts/addtrustclass1ca
- make/data/cacerts/keynectisrootca
- make/gendata/Gendata-java.base.gmk
- make/gendata/Gendata-java.desktop.gmk
- make/gendata/Gendata-jdk.compiler.gmk
- make/gendata/GendataBlacklistedCerts.gmk
- make/gendata/GendataBreakIterator.gmk
- make/gendata/GendataCommon.gmk
- make/gendata/GendataCryptoPolicy.gmk
- make/gendata/GendataFontConfig.gmk
- make/gendata/GendataHtml32dtd.gmk
- make/gendata/GendataPublicSuffixList.gmk
- make/gendata/GendataTZDB.gmk
- make/gensrc/Gensrc-java.base.gmk
- make/gensrc/Gensrc-java.desktop.gmk
- make/gensrc/Gensrc-java.logging.gmk
- make/gensrc/Gensrc-jdk.charsets.gmk
- make/gensrc/Gensrc-jdk.compiler.gmk
- make/gensrc/Gensrc-jdk.hotspot.agent.gmk
- make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
- make/gensrc/Gensrc-jdk.internal.vm.compiler.management.gmk
- make/gensrc/Gensrc-jdk.jartool.gmk
- make/gensrc/Gensrc-jdk.javadoc.gmk
- make/gensrc/Gensrc-jdk.jdeps.gmk
- make/gensrc/Gensrc-jdk.jdi.gmk
- make/gensrc/Gensrc-jdk.jlink.gmk
- make/gensrc/Gensrc-jdk.jshell.gmk
- make/gensrc/Gensrc-jdk.localedata.gmk
- make/gensrc/Gensrc-jdk.management.agent.gmk
- make/gensrc/GensrcBuffer.gmk
- make/gensrc/GensrcCharacterData.gmk
- make/gensrc/GensrcCharsetCoder.gmk
- make/gensrc/GensrcCharsetMapping.gmk
- make/gensrc/GensrcCommonJdk.gmk
- make/gensrc/GensrcCommonLangtools.gmk
- make/gensrc/GensrcEmojiData.gmk
- make/gensrc/GensrcExceptions.gmk
- make/gensrc/GensrcIcons.gmk
- make/gensrc/GensrcLocaleData.gmk
- make/gensrc/GensrcMisc.gmk
- make/gensrc/GensrcModuleInfo.gmk
- make/gensrc/GensrcModuleLoaderMap.gmk
- make/gensrc/GensrcProperties.gmk
- make/gensrc/GensrcSwing.gmk
- make/gensrc/GensrcVarHandles.gmk
- make/gensrc/GensrcX11Wrappers.gmk
- make/launcher/Launcher-java.base.gmk
- make/launcher/Launcher-java.rmi.gmk
- make/launcher/Launcher-java.scripting.gmk
- make/launcher/Launcher-java.security.jgss.gmk
- make/launcher/Launcher-jdk.accessibility.gmk
- make/launcher/Launcher-jdk.aot.gmk
- make/launcher/Launcher-jdk.compiler.gmk
- make/launcher/Launcher-jdk.hotspot.agent.gmk
- make/launcher/Launcher-jdk.incubator.jpackage.gmk
- make/launcher/Launcher-jdk.jartool.gmk
- make/launcher/Launcher-jdk.javadoc.gmk
- make/launcher/Launcher-jdk.jcmd.gmk
- make/launcher/Launcher-jdk.jconsole.gmk
- make/launcher/Launcher-jdk.jdeps.gmk
- make/launcher/Launcher-jdk.jdi.gmk
- make/launcher/Launcher-jdk.jfr.gmk
- make/launcher/Launcher-jdk.jlink.gmk
- make/launcher/Launcher-jdk.jshell.gmk
- make/launcher/Launcher-jdk.jstatd.gmk
- make/launcher/LauncherCommon.gmk
- make/lib/Awt2dLibraries.gmk
- make/lib/CoreLibraries.gmk
- make/lib/Lib-java.base.gmk
- make/lib/Lib-java.desktop.gmk
- make/lib/Lib-java.instrument.gmk
- make/lib/Lib-java.management.gmk
- make/lib/Lib-java.prefs.gmk
- make/lib/Lib-java.rmi.gmk
- make/lib/Lib-java.security.jgss.gmk
- make/lib/Lib-java.smartcardio.gmk
- make/lib/Lib-jdk.accessibility.gmk
- make/lib/Lib-jdk.attach.gmk
- make/lib/Lib-jdk.crypto.cryptoki.gmk
- make/lib/Lib-jdk.crypto.ec.gmk
- make/lib/Lib-jdk.crypto.mscapi.gmk
- make/lib/Lib-jdk.crypto.ucrypto.gmk
- make/lib/Lib-jdk.hotspot.agent.gmk
- make/lib/Lib-jdk.incubator.jpackage.gmk
- make/lib/Lib-jdk.internal.le.gmk
- make/lib/Lib-jdk.jdi.gmk
- make/lib/Lib-jdk.jdwp.agent.gmk
- make/lib/Lib-jdk.management.agent.gmk
- make/lib/Lib-jdk.management.gmk
- make/lib/Lib-jdk.net.gmk
- make/lib/Lib-jdk.sctp.gmk
- make/lib/Lib-jdk.security.auth.gmk
- make/lib/LibCommon.gmk
! src/hotspot/cpu/aarch64/aarch64.ad
! src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
! src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
! src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp
! src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
! src/hotspot/cpu/arm/arm.ad
! src/hotspot/cpu/ppc/ppc.ad
! src/hotspot/cpu/s390/s390.ad
! src/hotspot/cpu/sparc/sparc.ad
! src/hotspot/cpu/x86/x86_32.ad
! src/hotspot/cpu/x86/x86_64.ad
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/opto/castnode.cpp
! src/hotspot/share/opto/cfgnode.cpp
! src/hotspot/share/opto/classes.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/node.hpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM834.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM949C.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMOps.java
- src/jdk.incubator.jpackage/linux/native/jpackageapplauncher/launcher.cpp
- src/jdk.incubator.jpackage/linux/native/libapplauncher/LinuxPlatform.cpp
- src/jdk.incubator.jpackage/linux/native/libapplauncher/LinuxPlatform.h
- src/jdk.incubator.jpackage/linux/native/libapplauncher/PlatformDefs.h
- src/jdk.incubator.jpackage/macosx/native/jpackageapplauncher/main.m
- src/jdk.incubator.jpackage/macosx/native/libapplauncher/MacPlatform.h
- src/jdk.incubator.jpackage/macosx/native/libapplauncher/MacPlatform.mm
- src/jdk.incubator.jpackage/macosx/native/libapplauncher/PlatformDefs.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/FileAttributes.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/FilePath.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/Helpers.cpp
- src/jdk.incubator.jpackage/share/native/libapplauncher/Helpers.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/IniFile.cpp
- src/jdk.incubator.jpackage/share/native/libapplauncher/IniFile.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/JavaVirtualMachine.cpp
- src/jdk.incubator.jpackage/share/native/libapplauncher/JavaVirtualMachine.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/Library.cpp
- src/jdk.incubator.jpackage/share/native/libapplauncher/Library.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/Macros.cpp
- src/jdk.incubator.jpackage/share/native/libapplauncher/Macros.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/Messages.cpp
- src/jdk.incubator.jpackage/share/native/libapplauncher/Messages.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/OrderedMap.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/Package.cpp
- src/jdk.incubator.jpackage/share/native/libapplauncher/Package.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/Platform.cpp
- src/jdk.incubator.jpackage/share/native/libapplauncher/Platform.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/PlatformString.cpp
- src/jdk.incubator.jpackage/share/native/libapplauncher/PlatformString.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/Properties.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/PropertyFile.cpp
- src/jdk.incubator.jpackage/share/native/libapplauncher/PropertyFile.h
- src/jdk.incubator.jpackage/share/native/libapplauncher/main.cpp
- src/jdk.incubator.jpackage/unix/native/libapplauncher/FileAttribute.h
- src/jdk.incubator.jpackage/unix/native/libapplauncher/FileAttributes.cpp
- src/jdk.incubator.jpackage/unix/native/libapplauncher/FilePath.cpp
- src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp
- src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.h
- src/jdk.incubator.jpackage/windows/native/jpackageapplauncher/WinLauncher.cpp
- src/jdk.incubator.jpackage/windows/native/libapplauncher/DllMain.cpp
- src/jdk.incubator.jpackage/windows/native/libapplauncher/FileAttribute.h
- src/jdk.incubator.jpackage/windows/native/libapplauncher/FilePath.cpp
- src/jdk.incubator.jpackage/windows/native/libapplauncher/PlatformDefs.h
- src/jdk.incubator.jpackage/windows/native/libapplauncher/WindowsPlatform.cpp
- src/jdk.incubator.jpackage/windows/native/libapplauncher/WindowsPlatform.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/ByteBuffer.cpp
- src/jdk.incubator.jpackage/windows/native/libjpackage/ByteBuffer.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/ErrorHandling.cpp
- src/jdk.incubator.jpackage/windows/native/libjpackage/ErrorHandling.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/FileUtils.cpp
- src/jdk.incubator.jpackage/windows/native/libjpackage/FileUtils.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/Log.cpp
- src/jdk.incubator.jpackage/windows/native/libjpackage/Log.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/SourceCodePos.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/SysInfo.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/UniqueHandle.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/Utils.cpp
- src/jdk.incubator.jpackage/windows/native/libjpackage/Utils.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/VersionInfoSwap.cpp
- src/jdk.incubator.jpackage/windows/native/libjpackage/VersionInfoSwap.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/WinErrorHandling.cpp
- src/jdk.incubator.jpackage/windows/native/libjpackage/WinErrorHandling.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/WinSysInfo.cpp
- src/jdk.incubator.jpackage/windows/native/libjpackage/WinSysInfo.h
- src/jdk.incubator.jpackage/windows/native/libjpackage/tstrings.cpp
- src/jdk.incubator.jpackage/windows/native/libjpackage/tstrings.h
- test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/MemOptions.sh
- test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/MemStat.java
- test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/TEST.properties
- test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/TestDescription.java
- test/jdk/java/lang/management/MemoryMXBean/MemoryTestZGC.sh
- test/jdk/javax/net/ssl/compatibility/Cert.java
- test/jdk/javax/net/ssl/compatibility/Client.java
- test/jdk/javax/net/ssl/compatibility/Compatibility.java
- test/jdk/javax/net/ssl/compatibility/JdkUtils.java
- test/jdk/javax/net/ssl/compatibility/ProcessUtils.java
- test/jdk/javax/net/ssl/compatibility/Server.java
- test/jdk/javax/net/ssl/compatibility/Status.java
- test/jdk/javax/net/ssl/compatibility/TestCase.java
- test/jdk/javax/net/ssl/compatibility/UseCase.java
More information about the panama-dev
mailing list