Mercurial > jdk8-mips64-public / changeset

     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

     2.1 --- a/common/autoconf/jdk-options.m4	Mon Dec 16 11:22:17 2019 -0500
     2.2 +++ b/common/autoconf/jdk-options.m4	Tue Apr 21 12:00:59 2020 +0200
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -446,6 +446,8 @@
    2.11    elif test "x$enable_jfr" = "xyes" ; then
    2.12      if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
    2.13        AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
    2.14 +    elif test "x$OPENJDK_TARGET_OS" = xaix; then
    2.15 +      AC_MSG_ERROR([AIX does not support JFR])
    2.16      else
    2.17        ENABLE_JFR=true
    2.18      fi