diff -r bb464170d344 -r 0a7e81cbb5f7 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Thu Feb 27 19:01:12 2020 +0000 +++ b/common/autoconf/generated-configure.sh Tue Mar 03 12:57:18 2020 +0000 @@ -844,6 +844,7 @@ JDK_MINOR_VERSION JDK_MAJOR_VERSION USER_RELEASE_SUFFIX +ENABLE_JFR COMPRESS_JARS UNLIMITED_CRYPTO CACERTS_FILE @@ -1012,6 +1013,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -1058,6 +1060,7 @@ enable_hotspot_test_in_build with_cacerts_file enable_unlimited_crypto +enable_jfr with_milestone with_update_version with_user_release_suffix @@ -1253,6 +1256,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1505,6 +1509,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1642,7 +1655,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1795,6 +1808,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1843,6 +1857,7 @@ run the Queens test after Hotspot build [disabled] --enable-unlimited-crypto Enable unlimited crypto policy [disabled] + --disable-jfr Disable Java Flight Recorder support [enabled] --disable-debug-symbols disable generation of debug symbols [enabled] --disable-zip-debug-info disable zipping of debug-info files [enabled] @@ -4379,7 +4394,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1580709484 +DATE_WHEN_GENERATED=1582132239 ############################################################################### # @@ -19803,6 +19818,38 @@ + ############################################################################### + # + # Enable or disable JFR + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5 +$as_echo_n "checking whether to build jfr... " >&6; } + # Check whether --enable-jfr was given. +if test "${enable_jfr+set}" = set; then : + enableval=$enable_jfr; +else + enable_jfr=auto +fi + + 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 + 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5 +$as_echo "$ENABLE_JFR" >&6; } + + # Source the version numbers . $AUTOCONF_DIR/version-numbers