Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Mon Jun 01 14:46:02 2020 +0100
     1.2 +++ b/common/autoconf/generated-configure.sh	Wed Jun 03 01:17:10 2020 +0100
     1.3 @@ -1857,7 +1857,7 @@
     1.4                            run the Queens test after Hotspot build [disabled]
     1.5    --enable-unlimited-crypto
     1.6                            Enable unlimited crypto policy [disabled]
     1.7 -  --enable-jfr            Enable Java Flight Recorder support [disabled]
     1.8 +  --disable-jfr           Disable Java Flight Recorder support [enabled]
     1.9    --disable-debug-symbols disable generation of debug symbols [enabled]
    1.10    --disable-zip-debug-info
    1.11                            disable zipping of debug-info files [enabled]
    1.12 @@ -4394,7 +4394,7 @@
    1.13  #CUSTOM_AUTOCONF_INCLUDE
    1.14  
    1.15  # Do not change or remove the following line, it is needed for consistency checks:
    1.16 -DATE_WHEN_GENERATED=1589212500
    1.17 +DATE_WHEN_GENERATED=1591143270
    1.18  
    1.19  ###############################################################################
    1.20  #
    1.21 @@ -19822,8 +19822,8 @@
    1.22    #
    1.23    # Enable or disable JFR
    1.24    #
    1.25 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5
    1.26 -$as_echo_n "checking whether to build jfr... " >&6; }
    1.27 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build JFR" >&5
    1.28 +$as_echo_n "checking whether to build JFR... " >&6; }
    1.29    # Check whether --enable-jfr was given.
    1.30  if test "${enable_jfr+set}" = set; then :
    1.31    enableval=$enable_jfr;
    1.32 @@ -19831,18 +19831,26 @@
    1.33    enable_jfr=auto
    1.34  fi
    1.35  
    1.36 -  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
    1.37 +  if test "x$enable_jfr" = "xno"; then
    1.38      ENABLE_JFR=false
    1.39 -  elif test "x$enable_jfr" = "xyes" ; then
    1.40 +  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
    1.41      if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
    1.42 -      as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
    1.43 +      if test "x$enable_jfr" = "xyes"; then
    1.44 +        as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
    1.45 +      else
    1.46 +        ENABLE_JFR=false
    1.47 +      fi
    1.48      elif test "x$OPENJDK_TARGET_OS" = xaix; then
    1.49 -      as_fn_error $? "AIX does not support JFR" "$LINENO" 5
    1.50 +      if test "x$enable_jfr" = "xyes"; then
    1.51 +        as_fn_error $? "AIX does not support JFR" "$LINENO" 5
    1.52 +      else
    1.53 +        ENABLE_JFR=false
    1.54 +      fi
    1.55      else
    1.56        ENABLE_JFR=true
    1.57      fi
    1.58    else
    1.59 -    as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5
    1.60 +    as_fn_error $? "--enable-jfr must be set to either yes or no" "$LINENO" 5
    1.61    fi
    1.62    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5
    1.63  $as_echo "$ENABLE_JFR" >&6; }

     2.1 --- a/common/autoconf/jdk-options.m4	Mon Jun 01 14:46:02 2020 +0100
     2.2 +++ b/common/autoconf/jdk-options.m4	Wed Jun 03 01:17:10 2020 +0100
     2.3 @@ -437,22 +437,30 @@
     2.4    #
     2.5    # Enable or disable JFR
     2.6    #
     2.7 -  AC_MSG_CHECKING([whether to build jfr])
     2.8 -  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
     2.9 -      [Enable Java Flight Recorder support @<:@disabled@:>@])],,
    2.10 +  AC_MSG_CHECKING([whether to build JFR])
    2.11 +  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
    2.12 +      [Disable Java Flight Recorder support @<:@enabled@:>@])],,
    2.13        [enable_jfr=auto])
    2.14 -  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
    2.15 +  if test "x$enable_jfr" = "xno"; then
    2.16      ENABLE_JFR=false
    2.17 -  elif test "x$enable_jfr" = "xyes" ; then
    2.18 +  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
    2.19      if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
    2.20 -      AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
    2.21 +      if test "x$enable_jfr" = "xyes"; then
    2.22 +        AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
    2.23 +      else
    2.24 +        ENABLE_JFR=false
    2.25 +      fi
    2.26      elif test "x$OPENJDK_TARGET_OS" = xaix; then
    2.27 -      AC_MSG_ERROR([AIX does not support JFR])
    2.28 +      if test "x$enable_jfr" = "xyes"; then
    2.29 +        AC_MSG_ERROR([AIX does not support JFR])
    2.30 +      else
    2.31 +        ENABLE_JFR=false
    2.32 +      fi
    2.33      else
    2.34        ENABLE_JFR=true
    2.35      fi
    2.36    else
    2.37 -    AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
    2.38 +    AC_MSG_ERROR([--enable-jfr must be set to either yes or no])
    2.39    fi
    2.40    AC_MSG_RESULT([$ENABLE_JFR])
    2.41    AC_SUBST(ENABLE_JFR)