< prev index next >

common/autoconf/hotspot.m4

Print this page

        

*** 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 \ ! graal 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" ###############################################################################
*** 261,275 **** 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" --- 261,299 ---- 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 + if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then + AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci']) + fi + AC_MSG_RESULT([yes, forced]) + else + # By default enable graal build where JVMCI is available + if test "x$JVM_FEATURES_jvmci" = "xjvmci"; then + JVM_FEATURES_graal="graal" + AC_MSG_RESULT([yes]) + else + JVM_FEATURES_graal="" + AC_MSG_RESULT([no]) + fi + fi + + if test "x$JVM_FEATURES_graal" = "xgraal"; then + INCLUDE_GRAAL="true" + else + INCLUDE_GRAAL="false" + fi + AC_SUBST(INCLUDE_GRAAL) + # 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_graal" 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"
< prev index next >