Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8203410: Zero: Disable jfr feature by default
authorsgehwolf
Fri, 18 May 2018 15:35:32 +0200
changeset 50216 f4fd580dd7d1
parent 50215 2fb27c352cae
child 50217 843fc56f4686
8203410: Zero: Disable jfr feature by default Reviewed-by: erikj
make/autoconf/hotspot.m4 file | annotate | diff | comparison | revisions 
--- a/make/autoconf/hotspot.m4	Tue May 22 12:04:05 2018 -0300
+++ b/make/autoconf/hotspot.m4	Fri May 18 15:35:32 2018 +0200
@@ -309,9 +309,11 @@
     AC_MSG_ERROR([Specified JVM feature 'cmsgc' requires feature 'serialgc'])
   fi
 
-  # Enable JFR by default, except on linux-sparcv9 and on minimal.
-  if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then
-    NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr"
+  # Enable JFR by default, except for Zero, linux-sparcv9 and on minimal.
+  if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then
+    if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then
+      NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr"
+    fi
   fi
 
   # Turn on additional features based on other parts of configure
jdk-sandbox