common/autoconf/hotspot.m4

*** 199,210 ****
  
    if HOTSPOT_CHECK_JVM_FEATURE(management) && ! HOTSPOT_CHECK_JVM_FEATURE(nmt); then
      AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt'])
    fi
  
!   if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! HOTSPOT_CHECK_JVM_FEATURE(compiler2); then
!     AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2'])
    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
--- 199,210 ----
  
    if HOTSPOT_CHECK_JVM_FEATURE(management) && ! HOTSPOT_CHECK_JVM_FEATURE(nmt); then
      AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt'])
    fi
  
!   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
*** 240,250 ****
      if HOTSPOT_CHECK_JVM_FEATURE(shark); then
        AC_MSG_ERROR([To enable shark, you must use --with-jvm-variants=zeroshark])
      fi
    fi
  
!   # Only enable jvmci on x86_64, sparcv9 and aarch64, and only on server.
    if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
        test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
        test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
      JVM_FEATURES_jvmci="jvmci"
    else
--- 240,250 ----
      if HOTSPOT_CHECK_JVM_FEATURE(shark); then
        AC_MSG_ERROR([To enable shark, you must use --with-jvm-variants=zeroshark])
      fi
    fi
  
!   # Only enable jvmci on x86_64, sparcv9 and aarch64.
    if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
        test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
        test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
      JVM_FEATURES_jvmci="jvmci"
    else
*** 254,264 ****
    # All variants but minimal (and custom) get these features
    NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
  
    # Enable features depending on variant.
    JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
!   JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES"
    JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_custom="$JVM_FEATURES"
--- 254,264 ----
    # All variants but minimal (and custom) get these features
    NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
  
    # Enable features depending on variant.
    JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
!   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_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_custom="$JVM_FEATURES"