diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 2292bfe1789a7ea586d4629009357fae75aaddfb..c331fd9a2208c769615caa9011478187c4a54e8e 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4394,7 +4394,7 @@ VS_SDK_PLATFORM_NAME_2017=
 #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 @@ fi
   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
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
index fd6a075409eb102bbd70791071640475e69125d1..c75f24a418726ba87910165f95b34bd063f7e7ad 100644
--- a/common/autoconf/jdk-options.m4
+++ b/common/autoconf/jdk-options.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -446,6 +446,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   elif test "x$enable_jfr" = "xyes" ; then
     if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
       AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
+    elif test "x$OPENJDK_TARGET_OS" = xaix; then
+      AC_MSG_ERROR([AIX does not support JFR])
     else
       ENABLE_JFR=true
     fi