--- a/make/autoconf/hotspot.m4 Fri Jul 20 09:33:49 2018 +0200
+++ b/make/autoconf/hotspot.m4 Fri Jul 20 09:46:57 2018 +0200
@@ -331,8 +331,10 @@
# Enable JFR by default, except for Zero, linux-sparcv9 and on minimal.
if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then
- if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then
- NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr"
+ if test "x$OPENJDK_TARGET_OS" != xaix; then
+ if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then
+ NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr"
+ fi
fi
fi
@@ -459,7 +461,7 @@
JVM_FEATURES_aot="aot"
fi
else
- if test "x$enable_aot" = "xno" || "x$DISABLE_AOT" = "xaot"; then
+ if test "x$enable_aot" = "xno" || test "x$DISABLE_AOT" = "xaot"; then
AC_MSG_RESULT([no, forced])
else
AC_MSG_RESULT([no])