From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Mon, 9 Sep 2024 13:29:08 +0000 (+0200)
Subject: set default compatible cds alignment to auto for arm64
X-Git-Tag: archive/raspbian/21.0.5_6ea-1+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=34e66888478f290faefdb247faf72140c69abbaf;p=openjdk-21.git

set default compatible cds alignment to auto for arm64

Bug: https://bugs.openjdk.org/browse/JDK-8334895
Last-Update: 2024-06-25

ARM64 requires cds alignment option to be enabled if CDS is enabled.
Setting it to true will enable the option even if CDS is disabled
causing a configuration error. Setting option to auto allows one to
enable it only when CDS is enabled.

Gbp-Pq: Name jdk-8334895-proposed.patch
---

diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 2cbdf74ae..c1e2eb268 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -197,7 +197,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   # three different page sizes: 4K, 64K, and if run on Mac m1 hardware, 16K.
   COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false
   if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-    COMPATIBLE_CDS_ALIGNMENT_DEFAULT=true
+    COMPATIBLE_CDS_ALIGNMENT_DEFAULT=auto
   fi
   AC_SUBST(COMPATIBLE_CDS_ALIGNMENT_DEFAULT)