OpenJDK / amber / amber
changeset 56526:65896ed82849
8225104: 32-bit build failures after JDK-8222252
Reviewed-by: bobv, rkennke, dholmes
| author | shade |
|---|---|
| date | Sun, 02 Jun 2019 10:08:37 +0200 |
| parents | 905b2a416250 |
| children | 249b2b4fcb7d |
| files | src/hotspot/share/runtime/arguments.cpp |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/runtime/arguments.cpp Sat Jun 01 14:09:59 2019 -0700 +++ b/src/hotspot/share/runtime/arguments.cpp Sun Jun 02 10:08:37 2019 +0200 @@ -1782,6 +1782,8 @@ // Limit the heap size to ErgoHeapSizeLimit reasonable_max = MIN2(reasonable_max, (julong)ErgoHeapSizeLimit); } + +#ifdef _LP64 if (UseCompressedOops) { // Limit the heap size to the maximum possible when using compressed oops julong max_coop_heap = (julong)max_heap_for_compressed_oops(); @@ -1818,6 +1820,8 @@ } } } +#endif // _LP64 + reasonable_max = limit_by_allocatable_memory(reasonable_max); if (!FLAG_IS_DEFAULT(InitialHeapSize)) {