1.1 --- a/common/autoconf/jdk-options.m4 Mon Dec 16 11:22:17 2019 -0500 1.2 +++ b/common/autoconf/jdk-options.m4 Tue Apr 21 12:00:59 2020 +0200 1.3 @@ -1,5 +1,5 @@ 1.4 # 1.5 -# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. 1.6 +# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved. 1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 # 1.9 # This code is free software; you can redistribute it and/or modify it 1.10 @@ -446,6 +446,8 @@ 1.11 elif test "x$enable_jfr" = "xyes" ; then 1.12 if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then 1.13 AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build]) 1.14 + elif test "x$OPENJDK_TARGET_OS" = xaix; then 1.15 + AC_MSG_ERROR([AIX does not support JFR]) 1.16 else 1.17 ENABLE_JFR=true 1.18 fi