make/autoconf/hotspot.m4

*** 23,33 ****
  # questions.
  #
  
  # All valid JVM features, regardless of platform
  VALID_JVM_FEATURES="compiler1 compiler2 zero minimal dtrace jvmti jvmci \
!     graal vm-structs jni-check services management all-gcs nmt cds \
      static-build link-time-opt aot"
  
  # All valid JVM variants
  VALID_JVM_VARIANTS="server client minimal core zero custom"
  
--- 23,33 ----
  # questions.
  #
  
  # All valid JVM features, regardless of platform
  VALID_JVM_FEATURES="compiler1 compiler2 zero minimal dtrace jvmti jvmci \
!     graal vm-structs jni-check services management cmsgc g1gc parallelgc serialgc nmt cds \
      static-build link-time-opt aot"
  
  # All valid JVM variants
  VALID_JVM_VARIANTS="server client minimal core zero custom"
  
*** 303,318 ****
  
    if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! (HOTSPOT_CHECK_JVM_FEATURE(compiler1) || HOTSPOT_CHECK_JVM_FEATURE(compiler2)); then
      AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1'])
    fi
  
!   if HOTSPOT_CHECK_JVM_FEATURE(compiler2) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then
!     AC_MSG_ERROR([Specified JVM feature 'compiler2' requires feature 'all-gcs'])
!   fi
! 
!   if HOTSPOT_CHECK_JVM_FEATURE(vm-structs) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then
!     AC_MSG_ERROR([Specified JVM feature 'vm-structs' requires feature 'all-gcs'])
    fi
  
    # Turn on additional features based on other parts of configure
    if test "x$INCLUDE_DTRACE" = "xtrue"; then
      JVM_FEATURES="$JVM_FEATURES dtrace"
--- 303,314 ----
  
    if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! (HOTSPOT_CHECK_JVM_FEATURE(compiler1) || HOTSPOT_CHECK_JVM_FEATURE(compiler2)); then
      AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1'])
    fi
  
!   if HOTSPOT_CHECK_JVM_FEATURE(cmsgc) && ! HOTSPOT_CHECK_JVM_FEATURE(serialgc); then
!     AC_MSG_ERROR([Specified JVM feature 'cmsgc' requires feature 'serialgc'])
    fi
  
    # Turn on additional features based on other parts of configure
    if test "x$INCLUDE_DTRACE" = "xtrue"; then
      JVM_FEATURES="$JVM_FEATURES dtrace"
*** 393,412 ****
    else
      JVM_FEATURES_link_time_opt=""
    fi
  
    # All variants but minimal (and custom) get these features
!   NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti vm-structs jni-check services management all-gcs nmt"
    if test "x$ENABLE_CDS" = "xtrue"; then
      NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
    fi
  
    # Enable default features depending on variant.
    JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
    JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
    JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
!   JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES $JVM_FEATURES_link_time_opt"
    JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_custom="$JVM_FEATURES"
  
    AC_SUBST(JVM_FEATURES_server)
    AC_SUBST(JVM_FEATURES_client)
--- 389,408 ----
    else
      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"
    if test "x$ENABLE_CDS" = "xtrue"; then
      NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
    fi
  
    # Enable default features depending on variant.
    JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
    JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
    JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
!   JVM_FEATURES_minimal="compiler1 minimal serialgc $JVM_FEATURES $JVM_FEATURES_link_time_opt"
    JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_custom="$JVM_FEATURES"
  
    AC_SUBST(JVM_FEATURES_server)
    AC_SUBST(JVM_FEATURES_client)
*** 440,449 ****
--- 436,451 ----
  
      # Update real feature set variable
      eval $features_var_name='"'$JVM_FEATURES_FOR_VARIANT'"'
      AC_MSG_RESULT(["$JVM_FEATURES_FOR_VARIANT"])
  
+     # Verify that we have at least one gc selected
+     GC_FEATURES=`$ECHO $JVM_FEATURES_FOR_VARIANT | $GREP gc`
+     if test "x$GC_FEATURES" = x; then
+       AC_MSG_WARN([Invalid JVM features: No gc selected for variant $variant.])
+     fi
+ 
      # Validate features (for configure script errors, not user errors)
      BASIC_GET_NON_MATCHING_VALUES(INVALID_FEATURES, $JVM_FEATURES_FOR_VARIANT, $VALID_JVM_FEATURES)
      if test "x$INVALID_FEATURES" != x; then
        AC_MSG_ERROR([Internal configure script error. Invalid JVM feature(s): $INVALID_FEATURES])
      fi