common/autoconf/hotspot.m4

*** 213,228 ****
  
    if test "x$ENABLE_AOT" = "xtrue"; then
      # Only enable AOT on linux-X64.
      if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
        if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
!         if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then
            ENABLE_AOT="true"
          else
            ENABLE_AOT="false"
            if test "x$enable_aot" = "xyes"; then
!             AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.vm.compiler sources. Remove --enable-aot.])
            fi
          fi
        else
          ENABLE_AOT="false"
          if test "x$enable_aot" = "xyes"; then
--- 213,228 ----
  
    if test "x$ENABLE_AOT" = "xtrue"; then
      # Only enable AOT on linux-X64.
      if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
        if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
!         if test -e "$HOTSPOT_TOPDIR/src/jdk.internal.vm.compiler"; then
            ENABLE_AOT="true"
          else
            ENABLE_AOT="false"
            if test "x$enable_aot" = "xyes"; then
!             AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.internal.vm.compiler sources. Remove --enable-aot.])
            fi
          fi
        else
          ENABLE_AOT="false"
          if test "x$enable_aot" = "xyes"; then
*** 325,335 ****
      JVM_FEATURES_jvmci="jvmci"
    else
      JVM_FEATURES_jvmci=""
    fi
  
!   AC_MSG_CHECKING([if jdk.vm.compiler should be built])
    if HOTSPOT_CHECK_JVM_FEATURE(graal); then
      AC_MSG_RESULT([yes, forced])
      if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then
        AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci'])
      fi
--- 325,335 ----
      JVM_FEATURES_jvmci="jvmci"
    else
      JVM_FEATURES_jvmci=""
    fi
  
!   AC_MSG_CHECKING([if jdk.internal.vm.compiler should be built])
    if HOTSPOT_CHECK_JVM_FEATURE(graal); then
      AC_MSG_RESULT([yes, forced])
      if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then
        AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci'])
      fi