*** old/common/autoconf/hotspot.m4	Mon Aug 28 13:10:44 2017
--- new/common/autoconf/hotspot.m4	Mon Aug 28 13:10:44 2017

*** 333,344 ****
--- 333,348 ----
      if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then
        AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci'])
      fi
      INCLUDE_GRAAL="true"
    else
!     # By default enable graal build on linux-x64 or where AOT is available.
      if test "x$ENABLE_AOT" = "xtrue"; then
+     # graal build requires jvmci.
+     if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \
+         (test "x$OPENJDK_TARGET_CPU" = "xx86_64" && \
+          test "x$OPENJDK_TARGET_OS" = "xlinux" || \
+          test "x$ENABLE_AOT" = "xtrue") ; then
        AC_MSG_RESULT([yes])
        JVM_FEATURES_graal="graal"
        INCLUDE_GRAAL="true"
      else
        AC_MSG_RESULT([no])