From d6f8e793c2e04d7861c33fa63ee457157f2cee6f Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Fri, 24 May 2024 07:54:23 -0400 Subject: [PATCH] Setup default CDS alignment. For OpenJ9 it needs to be false. Issue https://github.com/eclipse-openj9/openj9/issues/19488 Signed-off-by: Peter Shipton --- make/autoconf/jdk-options.m4 | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index 12cf9a4bfd0..d6f03332b44 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -24,7 +24,7 @@ # # =========================================================================== -# (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved +# (c) Copyright IBM Corp. 2022, 2024 All Rights Reserved # =========================================================================== ############################################################################### @@ -208,15 +208,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], fi AC_SUBST(INCLUDE_SA) - # Setup default CDS alignment. On platforms where one build may run on machines with different - # page sizes, the JVM choses a compatible alignment to fit all possible page sizes. This slightly - # increases archive size. - # The only platform having this problem at the moment is Linux on aarch64, which may encounter - # three different page sizes: 4K, 64K, and if run on Mac m1 hardware, 16K. + # Setup default CDS alignment. For OpenJ9 it needs to be false. COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false - if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then - COMPATIBLE_CDS_ALIGNMENT_DEFAULT=true - fi AC_SUBST(COMPATIBLE_CDS_ALIGNMENT_DEFAULT) # Compress jars