Mercurial > hg > openjdk > jdk8u

changeset 2449:147fe4a4c0ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8239479: minimal1 and zero builds are failing Summary: Disable JFR by default when minimal or zero VM build is requested Reviewed-by: andrew
author apetushkov
date Mon, 24 Feb 2020 20:09:00 +0300
parents 8d1426351f61
children 0a7e81cbb5f7
files common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4
diffstat 2 files changed, 23 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Mon Feb 17 18:08:03 2020 +0100
+++ b/common/autoconf/generated-configure.sh	Mon Feb 24 20:09:00 2020 +0300
@@ -4391,7 +4391,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1580996389
+DATE_WHEN_GENERATED=1582132239
 
 ###############################################################################
 #
@@ -19827,13 +19827,21 @@
 if test "${enable_jfr+set}" = set; then :
   enableval=$enable_jfr;
 else
-  enable_jfr=yes
+  enable_jfr=auto
 fi
 
   if test "x$enable_jfr" = "xno"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes"; then
-    ENABLE_JFR=true
+  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
+      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
+    else
+      ENABLE_JFR=true
+    fi
   else
     as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5
   fi
--- a/common/autoconf/jdk-options.m4	Mon Feb 17 18:08:03 2020 +0100
+++ b/common/autoconf/jdk-options.m4	Mon Feb 24 20:09:00 2020 +0300
@@ -442,11 +442,19 @@
   AC_MSG_CHECKING([whether to build jfr])
   AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
       [Disable Java Flight Recorder support @<:@enabled@:>@])],,
-      [enable_jfr=yes])
+      [enable_jfr=auto])
   if test "x$enable_jfr" = "xno"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes"; then
-    ENABLE_JFR=true
+  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
+      if test "x$enable_jfr" = "xyes"; then
+        AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
+      else
+        ENABLE_JFR=false
+      fi
+    else
+      ENABLE_JFR=true
+    fi
   else
     AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
   fi