1.1 --- a/common/autoconf/generated-configure.sh Mon Dec 16 11:22:17 2019 -0500 1.2 +++ b/common/autoconf/generated-configure.sh Tue Apr 21 12:00:59 2020 +0200 1.3 @@ -4394,7 +4394,7 @@ 1.4 #CUSTOM_AUTOCONF_INCLUDE 1.5 1.6 # Do not change or remove the following line, it is needed for consistency checks: 1.7 -DATE_WHEN_GENERATED=1583241599 1.8 +DATE_WHEN_GENERATED=1585655585 1.9 1.10 ############################################################################### 1.11 # 1.12 @@ -19836,6 +19836,8 @@ 1.13 elif test "x$enable_jfr" = "xyes" ; then 1.14 if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then 1.15 as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5 1.16 + elif test "x$OPENJDK_TARGET_OS" = xaix; then 1.17 + as_fn_error $? "AIX does not support JFR" "$LINENO" 5 1.18 else 1.19 ENABLE_JFR=true 1.20 fi