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 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"
  
--- 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 epsilongc nmt cds \
      static-build link-time-opt aot"
  
  # All valid JVM variants
  VALID_JVM_VARIANTS="server client minimal core zero custom"
  
*** 389,399 ****
    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.
--- 389,399 ----
    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 epsilongc 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.