Mercurial > hg > openjdk > jdk8u

changeset 2451:10b17658c758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8240375: Disable JFR by default for July 2020 release Reviewed-by: aph, neugens
author andrew
date Tue, 03 Mar 2020 13:21:24 +0000
parents 0a7e81cbb5f7
children f0ce75a706cb
files common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4
diffstat 2 files changed, 10 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Tue Mar 03 12:57:18 2020 +0000
+++ b/common/autoconf/generated-configure.sh	Tue Mar 03 13:21:24 2020 +0000
@@ -1857,7 +1857,7 @@
                           run the Queens test after Hotspot build [disabled]
   --enable-unlimited-crypto
                           Enable unlimited crypto policy [disabled]
-  --disable-jfr           Disable Java Flight Recorder support [enabled]
+  --enable-jfr            Enable Java Flight Recorder support [disabled]
   --disable-debug-symbols disable generation of debug symbols [enabled]
   --disable-zip-debug-info
                           disable zipping of debug-info files [enabled]
@@ -4394,7 +4394,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1582132239
+DATE_WHEN_GENERATED=1583241599
 
 ###############################################################################
 #
@@ -19831,15 +19831,11 @@
   enable_jfr=auto
 fi
 
-  if test "x$enable_jfr" = "xno"; then
+  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
+  elif test "x$enable_jfr" = "xyes" ; then
     if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
-      if test "x$enable_jfr" = "xyes"; then
-        as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
-      else
-        ENABLE_JFR=false
-      fi
+      as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
     else
       ENABLE_JFR=true
     fi
--- a/common/autoconf/jdk-options.m4	Tue Mar 03 12:57:18 2020 +0000
+++ b/common/autoconf/jdk-options.m4	Tue Mar 03 13:21:24 2020 +0000
@@ -438,18 +438,14 @@
   # Enable or disable JFR
   #
   AC_MSG_CHECKING([whether to build jfr])
-  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
-      [Disable Java Flight Recorder support @<:@enabled@:>@])],,
+  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
+      [Enable Java Flight Recorder support @<:@disabled@:>@])],,
       [enable_jfr=auto])
-  if test "x$enable_jfr" = "xno"; then
+  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
+  elif test "x$enable_jfr" = "xyes" ; then
     if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
-      if test "x$enable_jfr" = "xyes"; then
-        AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
-      else
-        ENABLE_JFR=false
-      fi
+      AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
     else
       ENABLE_JFR=true
     fi