From f0e62003766599f9913ffe556c64aca397dab6c3 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Fri, 18 May 2018 15:35:32 +0200
Subject: [PATCH] 8203410: Zero: Disable jfr feature by default

Reviewed-by: erikj
---
 make/autoconf/hotspot.m4 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 7df870379fb..33f0adb1d3f 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -309,9 +309,11 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     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