From c62ff0f3169c7f7c70ec82a701bd32602b7dbb0e Mon Sep 17 00:00:00 2001 From: lhu Date: Thu, 31 Oct 2024 11:05:49 -0400 Subject: [PATCH] Update Java8 build specs for off-heap new define J9VM_GC_SPARSE_HEAP_ALLOCATION for the build specs Signed-off-by: lhu --- buildspecs/aix_ppc-64.spec | 1 + buildspecs/cmprssptrs.feature | 1 + buildspecs/j9.flags | 7 +++++++ buildspecs/linux_390-64.spec | 3 ++- buildspecs/linux_aarch64.spec | 1 + buildspecs/linux_aarch64_cross.spec | 1 + buildspecs/linux_ppc-64.spec | 3 ++- buildspecs/linux_ppc-64_le.spec | 3 ++- buildspecs/linux_riscv64.spec | 1 + buildspecs/linux_riscv64_cross.spec | 1 + buildspecs/linux_x86-64.spec | 3 ++- buildspecs/linux_ztpf_390-64.spec | 1 + buildspecs/osx_x86-64.spec | 3 ++- buildspecs/win_x86-64.spec | 1 + buildspecs/zos_390-64.spec | 1 + runtime/gc_modron_startup/mmhelpers.cpp | 6 +++--- 16 files changed, 29 insertions(+), 8 deletions(-) diff --git a/buildspecs/aix_ppc-64.spec b/buildspecs/aix_ppc-64.spec index 670507a757b..02453e52dca 100644 --- a/buildspecs/aix_ppc-64.spec +++ b/buildspecs/aix_ppc-64.spec @@ -139,6 +139,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex + diff --git a/buildspecs/cmprssptrs.feature b/buildspecs/cmprssptrs.feature index 276b3be38fa..54742a43492 100644 --- a/buildspecs/cmprssptrs.feature +++ b/buildspecs/cmprssptrs.feature @@ -32,6 +32,7 @@ + diff --git a/buildspecs/j9.flags b/buildspecs/j9.flags index 0a5b5e6c5ed..189147997bd 100644 --- a/buildspecs/j9.flags +++ b/buildspecs/j9.flags @@ -528,6 +528,13 @@ all data is stored in their own region. It additionaly reduces footprint, mainly Enable Segregated Heap model. The Segregated Heap model will not be used + + Allows large arrays to be allocated off-heap + + + + + Enable Strict OMR compile and link for testing Compile for JAVA diff --git a/buildspecs/linux_390-64.spec b/buildspecs/linux_390-64.spec index bff02e81bc8..49197c843f8 100644 --- a/buildspecs/linux_390-64.spec +++ b/buildspecs/linux_390-64.spec @@ -132,9 +132,10 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex - + + diff --git a/buildspecs/linux_aarch64.spec b/buildspecs/linux_aarch64.spec index 57bb3c9d844..b3b46ebe8fd 100644 --- a/buildspecs/linux_aarch64.spec +++ b/buildspecs/linux_aarch64.spec @@ -128,6 +128,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex + diff --git a/buildspecs/linux_aarch64_cross.spec b/buildspecs/linux_aarch64_cross.spec index c13717cb0b9..e4369e80044 100644 --- a/buildspecs/linux_aarch64_cross.spec +++ b/buildspecs/linux_aarch64_cross.spec @@ -129,6 +129,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex + diff --git a/buildspecs/linux_ppc-64.spec b/buildspecs/linux_ppc-64.spec index d8bbd985359..766eb123f47 100644 --- a/buildspecs/linux_ppc-64.spec +++ b/buildspecs/linux_ppc-64.spec @@ -136,9 +136,10 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex - + + diff --git a/buildspecs/linux_ppc-64_le.spec b/buildspecs/linux_ppc-64_le.spec index 44ba76deaba..9fea32f5596 100644 --- a/buildspecs/linux_ppc-64_le.spec +++ b/buildspecs/linux_ppc-64_le.spec @@ -138,9 +138,10 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex - + + diff --git a/buildspecs/linux_riscv64.spec b/buildspecs/linux_riscv64.spec index 7d2b5eeba6b..8c7c09c41b0 100644 --- a/buildspecs/linux_riscv64.spec +++ b/buildspecs/linux_riscv64.spec @@ -134,6 +134,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex + diff --git a/buildspecs/linux_riscv64_cross.spec b/buildspecs/linux_riscv64_cross.spec index c404442d451..cacb7485a93 100644 --- a/buildspecs/linux_riscv64_cross.spec +++ b/buildspecs/linux_riscv64_cross.spec @@ -135,6 +135,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex + diff --git a/buildspecs/linux_x86-64.spec b/buildspecs/linux_x86-64.spec index 0ee39da3595..162b121b08e 100644 --- a/buildspecs/linux_x86-64.spec +++ b/buildspecs/linux_x86-64.spec @@ -139,9 +139,10 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex - + + diff --git a/buildspecs/linux_ztpf_390-64.spec b/buildspecs/linux_ztpf_390-64.spec index 6fbb2d3e737..b440c78118b 100644 --- a/buildspecs/linux_ztpf_390-64.spec +++ b/buildspecs/linux_ztpf_390-64.spec @@ -134,6 +134,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex + diff --git a/buildspecs/osx_x86-64.spec b/buildspecs/osx_x86-64.spec index ee25484fbb1..5b16c3e2b6b 100644 --- a/buildspecs/osx_x86-64.spec +++ b/buildspecs/osx_x86-64.spec @@ -137,9 +137,10 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex - + + diff --git a/buildspecs/win_x86-64.spec b/buildspecs/win_x86-64.spec index 63e1caa403b..d92b8812455 100644 --- a/buildspecs/win_x86-64.spec +++ b/buildspecs/win_x86-64.spec @@ -147,6 +147,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex + diff --git a/buildspecs/zos_390-64.spec b/buildspecs/zos_390-64.spec index 3334db65548..b832459df95 100644 --- a/buildspecs/zos_390-64.spec +++ b/buildspecs/zos_390-64.spec @@ -132,6 +132,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex + diff --git a/runtime/gc_modron_startup/mmhelpers.cpp b/runtime/gc_modron_startup/mmhelpers.cpp index 0b2ebe25530..558c2f2c7ec 100644 --- a/runtime/gc_modron_startup/mmhelpers.cpp +++ b/runtime/gc_modron_startup/mmhelpers.cpp @@ -182,11 +182,11 @@ j9gc_hot_reference_field_required(J9JavaVM *javaVM) BOOLEAN j9gc_off_heap_allocation_enabled(J9JavaVM *javaVM) { -#if defined(J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION) +#if defined(J9VM_GC_SPARSE_HEAP_ALLOCATION) return MM_GCExtensions::getExtensions(javaVM)->isVirtualLargeObjectHeapEnabled; -#else /* defined(J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION) */ +#else /* defined(J9VM_GC_SPARSE_HEAP_ALLOCATION) */ return FALSE; -#endif /* defined(J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION) */ +#endif /* defined(J9VM_GC_SPARSE_HEAP_ALLOCATION) */ } /**