diff -r e74aae3e716e -r b187cde4b6f0 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Mon Dec 16 11:22:17 2019 -0500 +++ b/common/autoconf/generated-configure.sh Tue Apr 21 12:00:59 2020 +0200 @@ -4394,7 +4394,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1583241599 +DATE_WHEN_GENERATED=1585655585 ############################################################################### # @@ -19836,6 +19836,8 @@ elif test "x$enable_jfr" = "xyes" ; then if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5 + elif test "x$OPENJDK_TARGET_OS" = xaix; then + as_fn_error $? "AIX does not support JFR" "$LINENO" 5 else ENABLE_JFR=true fi