jdk-jdk Udiff make/autoconf/hotspot.m4 (original) (raw)
rev 50507 : 8204965: Fix '--disable-cds' and disable CDS on AIX by default
@@ -239,21 +239,31 @@ ################################################################################
Allow to disable CDS
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_CDS], [
- AC_ARG_ENABLE([cds], [AS_HELP_STRING([--enable-cds@<:@=yes/no@:>@],
[enable class data sharing feature in non-minimal VM. Default is yes.])])
- AC_ARG_ENABLE([cds], [AS_HELP_STRING([--enable-cds@<:@=yes/no/auto@:>@],
[enable class data sharing feature in non-minimal VM. Default is auto, where cds is enabled if supported on the platform.])])
- if test "x$enable_cds" = "x" || test "x$enable_cds" = "xyes"; then
if test "x$enable_cds" = "x" || test "x$enable_cds" = "xauto"; then
ENABLE_CDS="true"
elif test "x$enable_cds" = "xyes"; then ENABLE_CDS="true" elif test "x$enable_cds" = "xno"; then ENABLE_CDS="false" else AC_MSG_ERROR([Invalid value for --enable-cds: $enable_cds]) fi
Disable CDS on AIX.
if test "x$OPENJDK_TARGET_OS" = "xaix"; then
ENABLE_CDS="false"
if test "x$enable_cds" = "xyes"; then
AC_MSG_ERROR([CDS is currently not supported on AIX. Remove --enable-cds.])fi
fi
AC_SUBST(ENABLE_CDS) ])
###############################################################################
Set up all JVM features for each JVM variant.
@@ -409,12 +419,25 @@ JVM_FEATURES_link_time_opt="" fi
All variants but minimal (and custom) get these features
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc jni-check jvmti management nmt services vm-structs" +
- AC_MSG_CHECKING([if cds should be enabled]) if test "x$ENABLE_CDS" = "xtrue"; then
- if test "x$enable_cds" = "xyes"; then
AC_MSG_RESULT([yes, forced])- else
AC_MSG_RESULT([yes])- fi NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
- else
- if test "x$enable_cds" = "xno"; then
AC_MSG_RESULT([no, forced])- else
AC_MSG_RESULT([no])- fi
fi
Enable features depending on variant.
JVM_FEATURES_server="compiler1 compiler2 NONMINIMALFEATURESNON_MINIMAL_FEATURES NONMINIMALFEATURESJVM_FEATURES JVMFEATURESjvmciJVM_FEATURES_jvmci JVMFEATURESjvmciJVM_FEATURES_aot $JVM_FEATURES_graal" JVM_FEATURES_client="compiler1 NONMINIMALFEATURESNON_MINIMAL_FEATURES NONMINIMALFEATURESJVM_FEATURES $JVM_FEATURES_jvmci"