equal
deleted
inserted
replaced
213 |
213 |
214 if test "x$ENABLE_AOT" = "xtrue"; then |
214 if test "x$ENABLE_AOT" = "xtrue"; then |
215 # Only enable AOT on linux-X64. |
215 # Only enable AOT on linux-X64. |
216 if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then |
216 if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then |
217 if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then |
217 if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then |
218 if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then |
218 if test -e "$HOTSPOT_TOPDIR/src/jdk.internal.vm.compiler"; then |
219 ENABLE_AOT="true" |
219 ENABLE_AOT="true" |
220 else |
220 else |
221 ENABLE_AOT="false" |
221 ENABLE_AOT="false" |
222 if test "x$enable_aot" = "xyes"; then |
222 if test "x$enable_aot" = "xyes"; then |
223 AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.vm.compiler sources. Remove --enable-aot.]) |
223 AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.internal.vm.compiler sources. Remove --enable-aot.]) |
224 fi |
224 fi |
225 fi |
225 fi |
226 else |
226 else |
227 ENABLE_AOT="false" |
227 ENABLE_AOT="false" |
228 if test "x$enable_aot" = "xyes"; then |
228 if test "x$enable_aot" = "xyes"; then |
325 JVM_FEATURES_jvmci="jvmci" |
325 JVM_FEATURES_jvmci="jvmci" |
326 else |
326 else |
327 JVM_FEATURES_jvmci="" |
327 JVM_FEATURES_jvmci="" |
328 fi |
328 fi |
329 |
329 |
330 AC_MSG_CHECKING([if jdk.vm.compiler should be built]) |
330 AC_MSG_CHECKING([if jdk.internal.vm.compiler should be built]) |
331 if HOTSPOT_CHECK_JVM_FEATURE(graal); then |
331 if HOTSPOT_CHECK_JVM_FEATURE(graal); then |
332 AC_MSG_RESULT([yes, forced]) |
332 AC_MSG_RESULT([yes, forced]) |
333 if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then |
333 if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then |
334 AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci']) |
334 AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci']) |
335 fi |
335 fi |