Mercurial > hg > icedtea8-forest

changeset 2649:fd941269b297

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8u262-b01
author andrew
date Sun, 21 Jun 2020 23:40:07 +0100
parents dde28d05a6a3 (current diff) 3cf8935494d6 (diff)
children d92a759d5cf6
files .hgtags common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4
diffstat 5 files changed, 91 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sat May 02 19:28:03 2020 +0100
+++ b/.hgignore	Sun Jun 21 23:40:07 2020 +0100
@@ -5,3 +5,5 @@
 ^.hgtip
 ^.bridge2
 .DS_Store
+# Default ignored files
+.idea/workspace.xml
\ No newline at end of file
--- a/.hgtags	Sat May 02 19:28:03 2020 +0100
+++ b/.hgtags	Sun Jun 21 23:40:07 2020 +0100
@@ -1062,6 +1062,7 @@
 9fb3e77d22d6a616c33ae6feac9a847764968bc3 jdk8u252-b03
 6383ac7b39e4d10c1fa6bf174855bc259dd9cb22 jdk8u252-b04
 62c9a2725c6cbfcbd4c2d47c3751dbdecc2610ad jdk8u252-b05
+62c9a2725c6cbfcbd4c2d47c3751dbdecc2610ad jdk8u262-b00
 bb464170d34478503661419d2f2864af7553d696 jdk8u252-b06
 746815de8b5b0c661aa6a1fa9476be758cc51e17 jdk8u252-b07
 72a6d93679e5bee5d5192234b8421024233cf616 jdk8u252-b08
--- a/THIRD_PARTY_README	Sat May 02 19:28:03 2020 +0100
+++ b/THIRD_PARTY_README	Sun Jun 21 23:40:07 2020 +0100
@@ -2898,23 +2898,21 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to X Window System 6.8.2, which may be 
+%% This notice is provided with respect to xwd v1.0.7, which may be
 included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
 
+xwd utility
+
 --- begin of LICENSE ---
 
-This is the copyright for the files in src/solaris/native/sun/awt: list.h, 
-multiVis.h, wsutils.h, list.c, multiVis.c
-Copyright (c) 1994 Hewlett-Packard Co.
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright 1994 Hewlett-Packard Co.
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
 
 The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
@@ -2922,15 +2920,15 @@
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of the X Consortium shall
+Except as contained in this notice, the name of The Open Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
-from the X Consortium.
+from The Open Group.
 
 --- end of LICENSE ---
 _____________________________
--- a/common/autoconf/generated-configure.sh	Sat May 02 19:28:03 2020 +0100
+++ b/common/autoconf/generated-configure.sh	Sun Jun 21 23:40:07 2020 +0100
@@ -866,6 +866,7 @@
 JDK_MINOR_VERSION
 JDK_MAJOR_VERSION
 USER_RELEASE_SUFFIX
+ENABLE_JFR
 COMPRESS_JARS
 UNLIMITED_CRYPTO
 CACERTS_FILE
@@ -1035,6 +1036,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1082,6 +1084,7 @@
 enable_hotspot_test_in_build
 with_cacerts_file
 enable_unlimited_crypto
+enable_jfr
 with_milestone
 with_update_version
 with_user_release_suffix
@@ -1111,8 +1114,8 @@
 with_extra_cflags
 with_extra_cxxflags
 with_extra_ldflags
+with_extra_asflags
 enable_warnings_as_errors
-with_extra_asflags
 enable_debug_symbols
 enable_zip_debug_info
 with_native_debug_symbols
@@ -1298,6 +1301,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1550,6 +1554,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=* \
@@ -1687,7 +1700,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.
@@ -1840,6 +1853,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]
@@ -1888,6 +1902,7 @@
                           run the Queens test after Hotspot build [disabled]
   --enable-unlimited-crypto
                           Enable unlimited crypto policy [disabled]
+  --enable-jfr            Enable Java Flight Recorder support [disabled]
   --disable-warnings-as-errors
                           consider native warnings to be an error [disabled]
   --disable-debug-symbols disable generation of debug symbols [enabled]
@@ -3993,7 +4008,7 @@
 
 
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -4459,7 +4474,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1585090987
+DATE_WHEN_GENERATED=1592500545
 
 ###############################################################################
 #
@@ -19934,6 +19949,36 @@
 
 
 
+  ###############################################################################
+  #
+  # 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" -o "x$enable_jfr" = "xauto"; then
+    ENABLE_JFR=false
+  elif test "x$enable_jfr" = "xyes" ; then
+    if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
+      as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
+    elif test "x$OPENJDK_TARGET_OS" = xaix; then
+      as_fn_error $? "AIX does not support JFR" "$LINENO" 5
+    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
--- a/common/autoconf/jdk-options.m4	Sat May 02 19:28:03 2020 +0100
+++ b/common/autoconf/jdk-options.m4	Sun Jun 21 23:40:07 2020 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -458,6 +458,30 @@
   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([--enable-jfr],
+      [Enable Java Flight Recorder support @<:@disabled@:>@])],,
+      [enable_jfr=auto])
+  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
+    ENABLE_JFR=false
+  elif test "x$enable_jfr" = "xyes" ; then
+    if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
+      AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
+    elif test "x$OPENJDK_TARGET_OS" = xaix; then
+      AC_MSG_ERROR([AIX does not support JFR])
+    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)
 ])
 
 ###############################################################################