Mercurial > hg > icedtea8-forest

changeset 2672:7dea4754bd99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8246384: Enable JFR by default on supported architectures for October 2020 release Reviewed-by: aph, neugens
author andrew
date Wed, 03 Jun 2020 01:17:10 +0100
parents 2f973e405849
children 8054f6ed5d43
files common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4
diffstat 2 files changed, 33 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Mon Jun 01 14:46:02 2020 +0100
+++ b/common/autoconf/generated-configure.sh	Wed Jun 03 01:17:10 2020 +0100
@@ -1857,7 +1857,7 @@
                           run the Queens test after Hotspot build [disabled]
   --enable-unlimited-crypto
                           Enable unlimited crypto policy [disabled]
-  --enable-jfr            Enable Java Flight Recorder support [disabled]
+  --disable-jfr           Disable Java Flight Recorder support [enabled]
   --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=1589212500
+DATE_WHEN_GENERATED=1591143270
 
 ###############################################################################
 #
@@ -19822,8 +19822,8 @@
   #
   # Enable or disable JFR
   #
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5
-$as_echo_n "checking whether to build jfr... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build JFR" >&5
+$as_echo_n "checking whether to build JFR... " >&6; }
   # Check whether --enable-jfr was given.
 if test "${enable_jfr+set}" = set; then :
   enableval=$enable_jfr;
@@ -19831,18 +19831,26 @@
   enable_jfr=auto
 fi
 
-  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
+  if test "x$enable_jfr" = "xno"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes" ; then
+  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; 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
+      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
     elif test "x$OPENJDK_TARGET_OS" = xaix; then
-      as_fn_error $? "AIX does not support JFR" "$LINENO" 5
+      if test "x$enable_jfr" = "xyes"; then
+        as_fn_error $? "AIX does not support JFR" "$LINENO" 5
+      else
+        ENABLE_JFR=false
+      fi
     else
       ENABLE_JFR=true
     fi
   else
-    as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5
+    as_fn_error $? "--enable-jfr must be set to either yes or no" "$LINENO" 5
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5
 $as_echo "$ENABLE_JFR" >&6; }
--- a/common/autoconf/jdk-options.m4	Mon Jun 01 14:46:02 2020 +0100
+++ b/common/autoconf/jdk-options.m4	Wed Jun 03 01:17:10 2020 +0100
@@ -437,22 +437,30 @@
   #
   # Enable or disable JFR
   #
-  AC_MSG_CHECKING([whether to build jfr])
-  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
-      [Enable Java Flight Recorder support @<:@disabled@:>@])],,
+  AC_MSG_CHECKING([whether to build JFR])
+  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
+      [Disable Java Flight Recorder support @<:@enabled@:>@])],,
       [enable_jfr=auto])
-  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
+  if test "x$enable_jfr" = "xno"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes" ; then
+  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; 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])
+      if test "x$enable_jfr" = "xyes"; then
+        AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
+      else
+        ENABLE_JFR=false
+      fi
     elif test "x$OPENJDK_TARGET_OS" = xaix; then
-      AC_MSG_ERROR([AIX does not support JFR])
+      if test "x$enable_jfr" = "xyes"; then
+        AC_MSG_ERROR([AIX does not support JFR])
+      else
+        ENABLE_JFR=false
+      fi
     else
       ENABLE_JFR=true
     fi
   else
-    AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
+    AC_MSG_ERROR([--enable-jfr must be set to either yes or no])
   fi
   AC_MSG_RESULT([$ENABLE_JFR])
   AC_SUBST(ENABLE_JFR)