Tue, 03 Mar 2020 12:57:18 +0000
Merge
common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
common/autoconf/jdk-options.m4 | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/generated-configure.sh Thu Feb 27 19:01:12 2020 +0000 1.2 +++ b/common/autoconf/generated-configure.sh Tue Mar 03 12:57:18 2020 +0000 1.3 @@ -844,6 +844,7 @@ 1.4 JDK_MINOR_VERSION 1.5 JDK_MAJOR_VERSION 1.6 USER_RELEASE_SUFFIX 1.7 +ENABLE_JFR 1.8 COMPRESS_JARS 1.9 UNLIMITED_CRYPTO 1.10 CACERTS_FILE 1.11 @@ -1012,6 +1013,7 @@ 1.12 docdir 1.13 oldincludedir 1.14 includedir 1.15 +runstatedir 1.16 localstatedir 1.17 sharedstatedir 1.18 sysconfdir 1.19 @@ -1058,6 +1060,7 @@ 1.20 enable_hotspot_test_in_build 1.21 with_cacerts_file 1.22 enable_unlimited_crypto 1.23 +enable_jfr 1.24 with_milestone 1.25 with_update_version 1.26 with_user_release_suffix 1.27 @@ -1253,6 +1256,7 @@ 1.28 sysconfdir='${prefix}/etc' 1.29 sharedstatedir='${prefix}/com' 1.30 localstatedir='${prefix}/var' 1.31 +runstatedir='${localstatedir}/run' 1.32 includedir='${prefix}/include' 1.33 oldincludedir='/usr/include' 1.34 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' 1.35 @@ -1505,6 +1509,15 @@ 1.36 | -silent | --silent | --silen | --sile | --sil) 1.37 silent=yes ;; 1.38 1.39 + -runstatedir | --runstatedir | --runstatedi | --runstated \ 1.40 + | --runstate | --runstat | --runsta | --runst | --runs \ 1.41 + | --run | --ru | --r) 1.42 + ac_prev=runstatedir ;; 1.43 + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 1.44 + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 1.45 + | --run=* | --ru=* | --r=*) 1.46 + runstatedir=$ac_optarg ;; 1.47 + 1.48 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1.49 ac_prev=sbindir ;; 1.50 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ 1.51 @@ -1642,7 +1655,7 @@ 1.52 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1.53 datadir sysconfdir sharedstatedir localstatedir includedir \ 1.54 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1.55 - libdir localedir mandir 1.56 + libdir localedir mandir runstatedir 1.57 do 1.58 eval ac_val=\$$ac_var 1.59 # Remove trailing slashes. 1.60 @@ -1795,6 +1808,7 @@ 1.61 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1.62 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1.63 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1.64 + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] 1.65 --libdir=DIR object code libraries [EPREFIX/lib] 1.66 --includedir=DIR C header files [PREFIX/include] 1.67 --oldincludedir=DIR C header files for non-gcc [/usr/include] 1.68 @@ -1843,6 +1857,7 @@ 1.69 run the Queens test after Hotspot build [disabled] 1.70 --enable-unlimited-crypto 1.71 Enable unlimited crypto policy [disabled] 1.72 + --disable-jfr Disable Java Flight Recorder support [enabled] 1.73 --disable-debug-symbols disable generation of debug symbols [enabled] 1.74 --disable-zip-debug-info 1.75 disable zipping of debug-info files [enabled] 1.76 @@ -4379,7 +4394,7 @@ 1.77 #CUSTOM_AUTOCONF_INCLUDE 1.78 1.79 # Do not change or remove the following line, it is needed for consistency checks: 1.80 -DATE_WHEN_GENERATED=1580709484 1.81 +DATE_WHEN_GENERATED=1582132239 1.82 1.83 ############################################################################### 1.84 # 1.85 @@ -19803,6 +19818,38 @@ 1.86 1.87 1.88 1.89 + ############################################################################### 1.90 + # 1.91 + # Enable or disable JFR 1.92 + # 1.93 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5 1.94 +$as_echo_n "checking whether to build jfr... " >&6; } 1.95 + # Check whether --enable-jfr was given. 1.96 +if test "${enable_jfr+set}" = set; then : 1.97 + enableval=$enable_jfr; 1.98 +else 1.99 + enable_jfr=auto 1.100 +fi 1.101 + 1.102 + if test "x$enable_jfr" = "xno"; then 1.103 + ENABLE_JFR=false 1.104 + elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then 1.105 + if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then 1.106 + if test "x$enable_jfr" = "xyes"; then 1.107 + as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5 1.108 + else 1.109 + ENABLE_JFR=false 1.110 + fi 1.111 + else 1.112 + ENABLE_JFR=true 1.113 + fi 1.114 + else 1.115 + as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5 1.116 + fi 1.117 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5 1.118 +$as_echo "$ENABLE_JFR" >&6; } 1.119 + 1.120 + 1.121 1.122 # Source the version numbers 1.123 . $AUTOCONF_DIR/version-numbers
2.1 --- a/common/autoconf/jdk-options.m4 Thu Feb 27 19:01:12 2020 +0000 2.2 +++ b/common/autoconf/jdk-options.m4 Tue Mar 03 12:57:18 2020 +0000 2.3 @@ -432,6 +432,32 @@ 2.4 COMPRESS_JARS=false 2.5 2.6 AC_SUBST(COMPRESS_JARS) 2.7 + 2.8 + ############################################################################### 2.9 + # 2.10 + # Enable or disable JFR 2.11 + # 2.12 + AC_MSG_CHECKING([whether to build jfr]) 2.13 + AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr], 2.14 + [Disable Java Flight Recorder support @<:@enabled@:>@])],, 2.15 + [enable_jfr=auto]) 2.16 + if test "x$enable_jfr" = "xno"; then 2.17 + ENABLE_JFR=false 2.18 + elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then 2.19 + if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then 2.20 + if test "x$enable_jfr" = "xyes"; then 2.21 + AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build]) 2.22 + else 2.23 + ENABLE_JFR=false 2.24 + fi 2.25 + else 2.26 + ENABLE_JFR=true 2.27 + fi 2.28 + else 2.29 + AC_MSG_ERROR([--enable-jfr must either be set to yes or no]) 2.30 + fi 2.31 + AC_MSG_RESULT([$ENABLE_JFR]) 2.32 + AC_SUBST(ENABLE_JFR) 2.33 ]) 2.34 2.35 ###############################################################################