OpenJDK / jdk / jdk
changeset 57214:047b5d642743
8234791: Fix Client VM build for x86_64 and AArch64
Reviewed-by: adinn, aph, thartmann
| author | pli |
|---|---|
| date | Fri, 29 Nov 2019 03:48:30 +0000 |
| parents | a1802614d6fe |
| children | 775b714a2e49 |
| files | src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp src/hotspot/share/runtime/arguments.cpp |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp Wed Dec 04 07:07:21 2019 +0100 +++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp Fri Nov 29 03:48:30 2019 +0000 @@ -33,6 +33,7 @@ #include "interpreter/interp_masm.hpp" #include "logging/log.hpp" #include "memory/resourceArea.hpp" +#include "nativeInst_aarch64.hpp" #include "oops/compiledICHolder.hpp" #include "oops/klass.inline.hpp" #include "runtime/safepointMechanism.hpp"
--- a/src/hotspot/share/runtime/arguments.cpp Wed Dec 04 07:07:21 2019 +0100 +++ b/src/hotspot/share/runtime/arguments.cpp Fri Nov 29 03:48:30 2019 +0000 @@ -1693,11 +1693,9 @@ size_t max_heap_size = MAX3(MaxHeapSize, InitialHeapSize, MinHeapSize); if (max_heap_size <= max_heap_for_compressed_oops()) { -#if !defined(COMPILER1) || defined(TIERED) if (FLAG_IS_DEFAULT(UseCompressedOops)) { FLAG_SET_ERGO(UseCompressedOops, true); } -#endif } else { if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) { warning("Max heap size too large for Compressed Oops");