make/autoconf/hotspot.m4
Index
Unified diffs
Context diffs
Sdiffs
Frames
Patch
New
Old
Previous File
Next File
open Cdiff make/autoconf/hotspot.m4
make/autoconf/hotspot.m4
Print this page
*** 199,210 ****
ENABLE_AOT="true"
elif test "x$enable_aot" = "xyes"; then
ENABLE_AOT="true"
elif test "x$enable_aot" = "xno"; then
ENABLE_AOT="false"
- AC_MSG_CHECKING([if aot should be enabled])
- AC_MSG_RESULT([no, forced])
else
AC_MSG_ERROR([Invalid value for --enable-aot: $enable_aot])
fi
if test "x$ENABLE_AOT" = "xtrue"; then
--- 199,208 ----
*** 226,236 ****
fi
fi
else
ENABLE_AOT="false"
if test "x$enable_aot" = "xyes"; then
! AC_MSG_ERROR([AOT is currently only supported on x86_64. Remove --enable-aot.])
fi
fi
fi
AC_SUBST(ENABLE_AOT)
--- 224,234 ----
fi
fi
else
ENABLE_AOT="false"
if test "x$enable_aot" = "xyes"; then
! AC_MSG_ERROR([AOT is currently only supported on x86_64 and aarch64. Remove --enable-aot.])
fi
fi
fi
AC_SUBST(ENABLE_AOT)
*** 372,396 ****
if HOTSPOT_CHECK_JVM_FEATURE(zero); then
AC_MSG_ERROR([To enable zero, you must use --with-jvm-variants=zero])
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
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
INCLUDE_GRAAL="true"
else
# By default enable graal build on x64 or where AOT is available.
# graal build requires jvmci.
if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \
--- 370,420 ----
if HOTSPOT_CHECK_JVM_FEATURE(zero); then
AC_MSG_ERROR([To enable zero, you must use --with-jvm-variants=zero])
fi
fi
! AC_MSG_CHECKING([if jvmci module jdk.internal.vm.ci should be built])
! # Check if jvmci is diabled
! DISABLE_JVMCI=`$ECHO $DISABLED_JVM_FEATURES | $GREP jvmci`
! if test "x$DISABLE_JVMCI" = "xjvmci"; then
! AC_MSG_RESULT([no, forced])
! JVM_FEATURES_jvmci=""
! INCLUDE_JVMCI="false"
! else
! # 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
+ AC_MSG_RESULT([yes])
JVM_FEATURES_jvmci="jvmci"
+ INCLUDE_JVMCI="true"
else
+ AC_MSG_RESULT([no])
JVM_FEATURES_jvmci=""
+ INCLUDE_JVMCI="false"
+ if HOTSPOT_CHECK_JVM_FEATURE(jvmci); then
+ AC_MSG_ERROR([JVMCI is currently not supported on this platform.])
+ fi
fi
+ fi
+
+ AC_SUBST(INCLUDE_JVMCI)
! AC_MSG_CHECKING([if graal module jdk.internal.vm.compiler should be built])
! # Check if graal is diabled
! DISABLE_GRAAL=`$ECHO $DISABLED_JVM_FEATURES | $GREP graal`
! if test "x$DISABLE_GRAAL" = "xgraal"; then
! AC_MSG_RESULT([no, forced])
! JVM_FEATURES_graal=""
! INCLUDE_GRAAL="false"
! else
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
+ JVM_FEATURES_graal="graal"
INCLUDE_GRAAL="true"
else
# By default enable graal build on x64 or where AOT is available.
# graal build requires jvmci.
if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \
*** 403,431 ****
AC_MSG_RESULT([no])
JVM_FEATURES_graal=""
INCLUDE_GRAAL="false"
fi
fi
AC_SUBST(INCLUDE_GRAAL)
AC_MSG_CHECKING([if aot should be enabled])
if test "x$ENABLE_AOT" = "xtrue"; then
! if test "x$enable_aot" = "xyes"; then
AC_MSG_RESULT([yes, forced])
else
AC_MSG_RESULT([yes])
fi
JVM_FEATURES_aot="aot"
else
! if test "x$enable_aot" = "xno"; then
AC_MSG_RESULT([no, forced])
else
AC_MSG_RESULT([no])
fi
JVM_FEATURES_aot=""
fi
if test "x$OPENJDK_TARGET_CPU" = xarm ; then
# Default to use link time optimizations on minimal on arm
JVM_FEATURES_link_time_opt="link-time-opt"
else
--- 427,478 ----
AC_MSG_RESULT([no])
JVM_FEATURES_graal=""
INCLUDE_GRAAL="false"
fi
fi
+ fi
AC_SUBST(INCLUDE_GRAAL)
+ # Disable aot with '--with-jvm-features=-aot'
+ DISABLE_AOT=`$ECHO $DISABLED_JVM_FEATURES | $GREP aot`
+ if test "x$DISABLE_AOT" = "xaot"; then
+ ENABLE_AOT="false"
+ fi
+
AC_MSG_CHECKING([if aot should be enabled])
if test "x$ENABLE_AOT" = "xtrue"; then
! if test "x$JVM_FEATURES_graal" != "xgraal"; then
! if test "x$enable_aot" = "xyes" || HOTSPOT_CHECK_JVM_FEATURE(aot); then
! AC_MSG_RESULT([yes, forced])
! AC_MSG_ERROR([Specified JVM feature 'aot' requires feature 'graal'])
! else
! AC_MSG_RESULT([no])
! fi
! JVM_FEATURES_aot=""
! ENABLE_AOT="false"
! else
! if test "x$enable_aot" = "xyes" || HOTSPOT_CHECK_JVM_FEATURE(aot); then
AC_MSG_RESULT([yes, forced])
else
AC_MSG_RESULT([yes])
fi
JVM_FEATURES_aot="aot"
+ fi
else
! if test "x$enable_aot" = "xno" || "x$DISABLE_AOT" = "xaot"; then
AC_MSG_RESULT([no, forced])
else
AC_MSG_RESULT([no])
fi
JVM_FEATURES_aot=""
+ if HOTSPOT_CHECK_JVM_FEATURE(aot); then
+ AC_MSG_ERROR([To enable aot, you must use --enable-aot])
fi
+ fi
+
+ AC_SUBST(ENABLE_AOT)
if test "x$OPENJDK_TARGET_CPU" = xarm ; then
# Default to use link time optimizations on minimal on arm
JVM_FEATURES_link_time_opt="link-time-opt"
else
make/autoconf/hotspot.m4
Index
Unified diffs
Context diffs
Sdiffs
Frames
Patch
New
Old
Previous File
Next File