stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8334895: OpenJDK fails to configure on linux aarch64 when CDS is disabled after JDK-8331942

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Vladimir Petko 2024-06-27 20:27:51 +00:00 committed by Erik Joelsson
parent c35e58a5ad
commit 3b1ca98642
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
make/autoconf/jdk-options.m4
View File

@ -197,9 +197,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
# three different page sizes: 4K, 64K, and if run on Mac m1 hardware, 16K. # three different page sizes: 4K, 64K, and if run on Mac m1 hardware, 16K.
COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false
if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then 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 fi
AC_SUBST(COMPATIBLE_CDS_ALIGNMENT_DEFAULT)
# Compress jars # Compress jars
COMPRESS_JARS=false COMPRESS_JARS=false
@ -672,7 +671,7 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT],
UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: $COMPATIBLE_CDS_ALIGNMENT_DEFAULT, UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: $COMPATIBLE_CDS_ALIGNMENT_DEFAULT,
RESULT: ENABLE_COMPATIBLE_CDS_ALIGNMENT, RESULT: ENABLE_COMPATIBLE_CDS_ALIGNMENT,
DESC: [enable use alternative compatible cds core region alignment], DESC: [enable use alternative compatible cds core region alignment],
DEFAULT_DESC: [disabled], DEFAULT_DESC: [disabled except on linux-aarch64],
CHECKING_MSG: [if compatible cds region alignment enabled], CHECKING_MSG: [if compatible cds region alignment enabled],
CHECK_AVAILABLE: [ CHECK_AVAILABLE: [
AC_MSG_CHECKING([if CDS archive is available]) AC_MSG_CHECKING([if CDS archive is available])