make/autoconf/hotspot.m4

rev 52036 : 8211837: Creation of the default CDS Archive should depend on ENABLE_CDS

*** 250,267 ****
      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.
--- 250,259 ----
*** 487,496 ****
--- 479,516 ----
    fi
  
    # All variants but minimal (and custom) get these features
    NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc jni-check jvmti management nmt services vm-structs"
  
+   # 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
+ 
+   # Disable CDS if user requested it with --with-jvm-features=-cds.
+   DISABLE_CDS=`$ECHO $DISABLED_JVM_FEATURES | $GREP cds`
+   if test "x$DISABLE_CDS" = "xcds"; then
+     ENABLE_CDS="false"
+     if test "x$enable_cds" = "xyes"; then
+       AC_MSG_ERROR([CDS was disabled by --with-jvm-features=-cds. Remove --enable-cds.])
+     fi
+   fi
+ 
+   # Disable CDS for zero, minimal, core..
+   if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(minimal) || HOTSPOT_CHECK_JVM_VARIANT(core); then
+     # ..except when the user explicitely requested it with --enable-jvm-features
+     if ! HOTSPOT_CHECK_JVM_FEATURE(cds); then
+       ENABLE_CDS="false"
+       if test "x$enable_cds" = "xyes"; then
+         AC_MSG_ERROR([CDS not implemented for variants zero, minimal, core. Remove --enable-cds.])
+       fi
+     fi
+   fi
+ 
    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