equal
deleted
inserted
replaced
329 AC_MSG_ERROR([Specified JVM feature 'cmsgc' requires feature 'serialgc']) |
329 AC_MSG_ERROR([Specified JVM feature 'cmsgc' requires feature 'serialgc']) |
330 fi |
330 fi |
331 |
331 |
332 # Enable JFR by default, except for Zero, linux-sparcv9 and on minimal. |
332 # Enable JFR by default, except for Zero, linux-sparcv9 and on minimal. |
333 if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then |
333 if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then |
334 if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then |
334 if test "x$OPENJDK_TARGET_OS" != xaix; then |
335 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr" |
335 if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then |
|
336 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr" |
|
337 fi |
336 fi |
338 fi |
337 fi |
339 fi |
338 |
340 |
339 # Only enable ZGC on Linux x86_64 |
341 # Only enable ZGC on Linux x86_64 |
340 AC_MSG_CHECKING([if zgc should be built]) |
342 AC_MSG_CHECKING([if zgc should be built]) |
457 AC_MSG_RESULT([yes]) |
459 AC_MSG_RESULT([yes]) |
458 fi |
460 fi |
459 JVM_FEATURES_aot="aot" |
461 JVM_FEATURES_aot="aot" |
460 fi |
462 fi |
461 else |
463 else |
462 if test "x$enable_aot" = "xno" || "x$DISABLE_AOT" = "xaot"; then |
464 if test "x$enable_aot" = "xno" || test "x$DISABLE_AOT" = "xaot"; then |
463 AC_MSG_RESULT([no, forced]) |
465 AC_MSG_RESULT([no, forced]) |
464 else |
466 else |
465 AC_MSG_RESULT([no]) |
467 AC_MSG_RESULT([no]) |
466 fi |
468 fi |
467 JVM_FEATURES_aot="" |
469 JVM_FEATURES_aot="" |