diff -r bb464170d344 -r 0a7e81cbb5f7 common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Thu Feb 27 19:01:12 2020 +0000
+++ b/common/autoconf/jdk-options.m4	Tue Mar 03 12:57:18 2020 +0000
@@ -432,6 +432,32 @@
   COMPRESS_JARS=false
 
   AC_SUBST(COMPRESS_JARS)
+
+  ###############################################################################
+  #
+  # 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@:>@])],,
+      [enable_jfr=auto])
+  if test "x$enable_jfr" = "xno"; then
+    ENABLE_JFR=false
+  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
+  AC_MSG_RESULT([$ENABLE_JFR])
+  AC_SUBST(ENABLE_JFR)
 ])
 
 ###############################################################################