Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Mon Feb 17 18:08:03 2020 +0100
     1.2 +++ b/common/autoconf/generated-configure.sh	Mon Feb 24 20:09:00 2020 +0300
     1.3 @@ -4391,7 +4391,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=1580996389
     1.8 +DATE_WHEN_GENERATED=1582132239
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -19827,13 +19827,21 @@
    1.13  if test "${enable_jfr+set}" = set; then :
    1.14    enableval=$enable_jfr;
    1.15  else
    1.16 -  enable_jfr=yes
    1.17 +  enable_jfr=auto
    1.18  fi
    1.19  
    1.20    if test "x$enable_jfr" = "xno"; then
    1.21      ENABLE_JFR=false
    1.22 -  elif test "x$enable_jfr" = "xyes"; then
    1.23 -    ENABLE_JFR=true
    1.24 +  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
    1.25 +    if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
    1.26 +      if test "x$enable_jfr" = "xyes"; then
    1.27 +        as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
    1.28 +      else
    1.29 +        ENABLE_JFR=false
    1.30 +      fi
    1.31 +    else
    1.32 +      ENABLE_JFR=true
    1.33 +    fi
    1.34    else
    1.35      as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5
    1.36    fi

     2.1 --- a/common/autoconf/jdk-options.m4	Mon Feb 17 18:08:03 2020 +0100
     2.2 +++ b/common/autoconf/jdk-options.m4	Mon Feb 24 20:09:00 2020 +0300
     2.3 @@ -442,11 +442,19 @@
     2.4    AC_MSG_CHECKING([whether to build jfr])
     2.5    AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
     2.6        [Disable Java Flight Recorder support @<:@enabled@:>@])],,
     2.7 -      [enable_jfr=yes])
     2.8 +      [enable_jfr=auto])
     2.9    if test "x$enable_jfr" = "xno"; then
    2.10      ENABLE_JFR=false
    2.11 -  elif test "x$enable_jfr" = "xyes"; then
    2.12 -    ENABLE_JFR=true
    2.13 +  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
    2.14 +    if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
    2.15 +      if test "x$enable_jfr" = "xyes"; then
    2.16 +        AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
    2.17 +      else
    2.18 +        ENABLE_JFR=false
    2.19 +      fi
    2.20 +    else
    2.21 +      ENABLE_JFR=true
    2.22 +    fi
    2.23    else
    2.24      AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
    2.25    fi