1.1 --- a/common/autoconf/generated-configure.sh Sat Oct 24 16:18:46 2020 +0800 1.2 +++ b/common/autoconf/generated-configure.sh Sat Oct 24 16:42:47 2020 +0800 1.3 @@ -1860,7 +1860,7 @@ 1.4 run the Queens test after Hotspot build [disabled] 1.5 --enable-unlimited-crypto 1.6 Enable unlimited crypto policy [disabled] 1.7 - --enable-jfr Enable Java Flight Recorder support [disabled] 1.8 + --disable-jfr Disable Java Flight Recorder support [enabled] 1.9 --disable-debug-symbols disable generation of debug symbols [enabled] 1.10 --disable-zip-debug-info 1.11 disable zipping of debug-info files [enabled] 1.12 @@ -4403,7 +4403,7 @@ 1.13 #CUSTOM_AUTOCONF_INCLUDE 1.14 1.15 # Do not change or remove the following line, it is needed for consistency checks: 1.16 -DATE_WHEN_GENERATED=1589212500 1.17 +DATE_WHEN_GENERATED=1591143270 1.18 1.19 ############################################################################### 1.20 # 1.21 @@ -19854,8 +19854,8 @@ 1.22 # 1.23 # Enable or disable JFR 1.24 # 1.25 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5 1.26 -$as_echo_n "checking whether to build jfr... " >&6; } 1.27 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build JFR" >&5 1.28 +$as_echo_n "checking whether to build JFR... " >&6; } 1.29 # Check whether --enable-jfr was given. 1.30 if test "${enable_jfr+set}" = set; then : 1.31 enableval=$enable_jfr; 1.32 @@ -19863,18 +19863,26 @@ 1.33 enable_jfr=auto 1.34 fi 1.35 1.36 - if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then 1.37 + if test "x$enable_jfr" = "xno"; then 1.38 ENABLE_JFR=false 1.39 - elif test "x$enable_jfr" = "xyes" ; then 1.40 + elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then 1.41 if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then 1.42 - as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5 1.43 + if test "x$enable_jfr" = "xyes"; then 1.44 + as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5 1.45 + else 1.46 + ENABLE_JFR=false 1.47 + fi 1.48 elif test "x$OPENJDK_TARGET_OS" = xaix; then 1.49 - as_fn_error $? "AIX does not support JFR" "$LINENO" 5 1.50 + if test "x$enable_jfr" = "xyes"; then 1.51 + as_fn_error $? "AIX does not support JFR" "$LINENO" 5 1.52 + else 1.53 + ENABLE_JFR=false 1.54 + fi 1.55 else 1.56 ENABLE_JFR=true 1.57 fi 1.58 else 1.59 - as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5 1.60 + as_fn_error $? "--enable-jfr must be set to either yes or no" "$LINENO" 5 1.61 fi 1.62 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5 1.63 $as_echo "$ENABLE_JFR" >&6; }