Mercurial > hg > openjdk > jdk8u
changeset 2456:b187cde4b6f0
8241902: AIX Build broken after integration of JDK-8223147 (JFR Backport)
Reviewed-by: mdoerr, apetushkov
| author | clanger |
|---|---|
| date | Tue, 21 Apr 2020 12:00:59 +0200 |
| parents | e74aae3e716e |
| children | 3cf8935494d6 |
| files | common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/common/autoconf/jdk-options.m4 Mon Dec 16 11:22:17 2019 -0500 +++ b/common/autoconf/jdk-options.m4 Tue Apr 21 12:00:59 2020 +0200 @@ -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 @@ 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