hg: panama/dev: Manual merge
vladimir.x.ivanov at oracle.com
vladimir.x.ivanov at oracle.com
Fri Oct 26 17:29:16 UTC 2018
Changeset: 4d33ee124888
Author: vlivanov
Date: 2018-10-26 10:28 -0700
URL: http://hg.openjdk.java.net/panama/dev/rev/4d33ee124888
Manual merge
! make/common/NativeCompilation.gmk
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
! src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
! src/hotspot/cpu/x86/stubRoutines_x86.hpp
! src/hotspot/cpu/x86/stubRoutines_x86_64.cpp
! src/hotspot/cpu/x86/x86_64.ad
! src/hotspot/share/opto/cfgnode.cpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/parse2.cpp
! src/hotspot/share/opto/subnode.hpp
- test/jdk/java/util/Locale/LocaleCategory.sh
- test/jdk/java/util/Locale/LocaleProviders.sh
- test/jdk/lib/security/CheckBlacklistedCerts.java
- test/jdk/lib/security/cacerts/VerifyCACerts.java
- test/jdk/lib/testlibrary/ModuleTargetHelper.java
- test/jdk/lib/testlibrary/ModuleUtils.java
- test/jdk/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java
- test/jdk/lib/testlibrary/jdk/testlibrary/testkeys
More information about the panama-dev
mailing list