hg: panama/dev: manual merge with default
sandhya.viswanathan at intel.com
sandhya.viswanathan at intel.com
Thu Feb 13 19:19:31 UTC 2020
Changeset: 8d42f1da9766
Author: sviswanathan
Date: 2020-02-13 11:07 -0800
URL: https://hg.openjdk.java.net/panama/dev/rev/8d42f1da9766
manual merge with default
! make/autoconf/toolchain.m4
! src/hotspot/cpu/arm/arm.ad
! src/hotspot/cpu/arm/sharedRuntime_arm.cpp
! src/hotspot/cpu/x86/assembler_x86.cpp
! src/hotspot/cpu/x86/assembler_x86.hpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
! src/hotspot/cpu/x86/x86_64.ad
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.cpp
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.hpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.hpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.hpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.cpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.hpp
- src/hotspot/share/gc/parallel/psMarkSweep.cpp
- src/hotspot/share/gc/parallel/psMarkSweep.hpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.cpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp
- src/hotspot/share/gc/parallel/psMarkSweepProxy.hpp
- src/hotspot/share/gc/shared/owstTaskTerminator.cpp
- src/hotspot/share/gc/shared/owstTaskTerminator.hpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/opto/escape.cpp
! src/hotspot/share/opto/runtime.cpp
! src/hotspot/share/opto/superword.cpp
! src/hotspot/share/prims/unsafe.cpp
! src/hotspot/share/runtime/stackValue.cpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/hotspot/share/utilities/globalDefinitions.hpp
- src/java.base/share/classes/java/lang/reflect/ProxyGenerator_v49.java
- src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties
! src/java.base/share/classes/jdk/internal/misc/Unsafe.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/external/jquery/jquery.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
- test/hotspot/jtreg/runtime/7162488/Test7162488.sh
- test/hotspot/jtreg/runtime/StackGap/testme.sh
- test/hotspot/jtreg/runtime/StackGuardPages/testme.sh
- test/hotspot/jtreg/runtime/TLS/testtls.sh
- test/hotspot/jtreg/runtime/records/TEST.properties
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/run.sh
- test/hotspot/jtreg/vmTestbase/jit/tiered/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/tiered/tieredTest.sh
- test/hotspot/jtreg/vmTestbase/metaspace/flags/maxMetaspaceSize/TestDescription.java
- test/hotspot/jtreg/vmTestbase/metaspace/flags/maxMetaspaceSize/maxMetaspaceSize.sh
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/run.sh
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/run.sh
- test/jdk/java/io/Serializable/records/TEST.properties
- test/jdk/java/lang/instrument/TEST.properties
- test/jdk/java/lang/reflect/records/TEST.properties
- test/jdk/java/lang/runtime/TEST.properties
- test/jdk/jdk/jfr/event/io/EvilInstrument.java
- test/jdk/jdk/jfr/event/sampling/libTestNative.c
- test/jdk/sun/security/krb5/auto/SaslGSS.java
- test/langtools/jdk/javadoc/doclet/testOptions/help.html
More information about the panama-dev
mailing list