common/autoconf/hotspot.m4

*** 23,33 ****
  # questions.
  #
  
  # All valid JVM features, regardless of platform
  VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
!     fprof vm-structs jni-check services management all-gcs nmt cds static-build"
  
  # All valid JVM variants
  VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
  
  ###############################################################################
--- 23,33 ----
  # questions.
  #
  
  # All valid JVM features, regardless of platform
  VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
!     fprof vm-structs jni-check services management all-gcs nmt cds static-build aot"
  
  # All valid JVM variants
  VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
  
  ###############################################################################
*** 172,181 ****
--- 172,226 ----
      AC_MSG_ERROR([Invalid value for --enable-dtrace: $enable_dtrace])
    fi
    AC_SUBST(INCLUDE_DTRACE)
  ])
  
+ ################################################################################
+ # Check if AOT should be enabled
+ #
+ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
+ [
+   AC_ARG_ENABLE([aot], [AS_HELP_STRING([--enable-aot@<:@=yes/no/auto@:>@],
+       [enable ahead of time compilation feature. Default is auto, where aot is enabled if all dependencies are present.])])
+ 
+   AC_MSG_CHECKING([if aot src is present])
+   if test -d "$HOTSPOT_TOPDIR/src/jdk.aot"; then
+     AC_MSG_RESULT([yes])
+ 
+     ENABLE_AOT_DEFAULT="false"
+     # Only enable AOT on linux-X64.
+     if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
+       ENABLE_AOT_DEFAULT="true"
+     fi
+ 
+     AC_MSG_CHECKING([if aot should be enabled])
+     if test "x$enable_aot" = "x" || test "x$enable_aot" = "xauto"; then
+       if test "x$ENABLE_AOT_DEFAULT" = "xtrue"; then
+         AC_MSG_RESULT([yes])
+         ENABLE_AOT="true"
+       else
+         AC_MSG_RESULT([no])
+         ENABLE_AOT="false"
+       fi
+     elif test "x$enable_aot" = "xyes"; then
+       AC_MSG_RESULT([yes, forced])
+       ENABLE_AOT="true"
+     elif test "x$enable_aot" = "xno"; then
+       AC_MSG_RESULT([no, forced])
+       ENABLE_AOT="false"
+     else
+       AC_MSG_ERROR([Invalid value for --enable-aot: $enable_aot])
+     fi
+ 
+   else
+     AC_MSG_RESULT([no])
+     ENABLE_AOT="false"
+   fi
+ 
+   AC_SUBST(ENABLE_AOT)
+ ])
+ 
  ###############################################################################
  # Set up all JVM features for each JVM variant.
  #
  AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
  [
*** 246,260 ****
      JVM_FEATURES_jvmci="jvmci"
    else
      JVM_FEATURES_jvmci=""
    fi
  
    # 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"
--- 291,311 ----
      JVM_FEATURES_jvmci="jvmci"
    else
      JVM_FEATURES_jvmci=""
    fi
  
+   if test "x$ENABLE_AOT" = "xtrue"; then
+     JVM_FEATURES_aot="aot"
+   else
+     JVM_FEATURES_aot=""
+   fi
+ 
    # 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_aot"
    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"