1.1 --- a/common/autoconf/generated-configure.sh Wed Oct 14 16:43:12 2020 +0800
1.2 +++ b/common/autoconf/generated-configure.sh Wed Oct 14 17:44:46 2020 +0800
1.3 @@ -847,6 +847,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 @@ -1015,6 +1016,7 @@
1.12 docdir
1.13 oldincludedir
1.14 includedir
1.15 +runstatedir
1.16 localstatedir
1.17 sharedstatedir
1.18 sysconfdir
1.19 @@ -1061,6 +1063,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 @@ -1256,6 +1259,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 @@ -1508,6 +1512,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 @@ -1645,7 +1658,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 @@ -1798,6 +1811,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 @@ -1846,6 +1860,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 + --enable-jfr Enable Java Flight Recorder support [disabled]
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 @@ -3915,7 +3930,7 @@
1.77
1.78
1.79 #
1.80 -# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
1.81 +# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
1.82 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.83 #
1.84 # This code is free software; you can redistribute it and/or modify it
1.85 @@ -4388,7 +4403,7 @@
1.86 #CUSTOM_AUTOCONF_INCLUDE
1.87
1.88 # Do not change or remove the following line, it is needed for consistency checks:
1.89 -DATE_WHEN_GENERATED=1585090987
1.90 +DATE_WHEN_GENERATED=1589212500
1.91
1.92 ###############################################################################
1.93 #
1.94 @@ -19835,6 +19850,36 @@
1.95
1.96
1.97
1.98 + ###############################################################################
1.99 + #
1.100 + # Enable or disable JFR
1.101 + #
1.102 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5
1.103 +$as_echo_n "checking whether to build jfr... " >&6; }
1.104 + # Check whether --enable-jfr was given.
1.105 +if test "${enable_jfr+set}" = set; then :
1.106 + enableval=$enable_jfr;
1.107 +else
1.108 + enable_jfr=auto
1.109 +fi
1.110 +
1.111 + if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
1.112 + ENABLE_JFR=false
1.113 + elif test "x$enable_jfr" = "xyes" ; then
1.114 + if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
1.115 + as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
1.116 + elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.117 + as_fn_error $? "AIX does not support JFR" "$LINENO" 5
1.118 + else
1.119 + ENABLE_JFR=true
1.120 + fi
1.121 + else
1.122 + as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5
1.123 + fi
1.124 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5
1.125 +$as_echo "$ENABLE_JFR" >&6; }
1.126 +
1.127 +
1.128
1.129 # Source the version numbers
1.130 . $AUTOCONF_DIR/version-numbers
1.131 @@ -27987,7 +28032,7 @@
1.132 COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.133 $SED -e 's/ *Copyright .*//'`
1.134 COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.135 - $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
1.136 + $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
1.137 elif test "x$TOOLCHAIN_TYPE" = xclang; then
1.138 # clang --version output typically looks like
1.139 # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
1.140 @@ -29728,7 +29773,7 @@
1.141 COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.142 $SED -e 's/ *Copyright .*//'`
1.143 COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.144 - $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
1.145 + $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
1.146 elif test "x$TOOLCHAIN_TYPE" = xclang; then
1.147 # clang --version output typically looks like
1.148 # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
