Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/.hgtags	Wed Oct 14 16:43:13 2020 +0800
     1.2 +++ b/.hgtags	Wed Oct 14 17:44:46 2020 +0800
     1.3 @@ -1091,8 +1091,20 @@
     1.4  91381cf36ea49a3e08b10971160f714a6bf71dfd jdk8u252-b03
     1.5  e767af0b6500d829977e23cfb3fe19f28a4e9f88 jdk8u252-b04
     1.6  7fd34fff5c4418b869b96c6f3c1f9fd632590a5b jdk8u252-b05
     1.7 +7fd34fff5c4418b869b96c6f3c1f9fd632590a5b jdk8u262-b00
     1.8  b988f627520c45015f0b91d2ee35e69531300770 jdk8u252-b06
     1.9  0666ec7fe2b45353dc0e09c1f6f386bdf763eeb4 jdk8u252-b07
    1.10  95d61d0f326bbfaddc2cbd29e67b12c00041caaa jdk8u252-b08
    1.11 +2f5ad880fd3372eb5c2e5ac5ee82c705a1b6ac07 jdk8u252-b09
    1.12 +2f5ad880fd3372eb5c2e5ac5ee82c705a1b6ac07 jdk8u252-ga
    1.13  cd5f24c9b01f7dd757be5b42811a0ec7f6754ba9 mips64el-jdk8u252-b10
    1.14  fb00d0f2760cb485167448cb0267a4613a2b3487 mips64el-jdk8u252-b11
    1.15 +0a00f1ccd7e96bcd7eb102b510fc1e639e0c554b jdk8u262-b01
    1.16 +60239ecaefa22c4f415c3170fe93065f344bf15b jdk8u262-b02
    1.17 +0b39fe441888452aa6a7aabef856c23e8cabf9ff jdk8u262-b03
    1.18 +eef87c0da03ebb76368edb3195c1c5924edda265 jdk8u262-b04
    1.19 +e2a7c53cfa4d3c689bb819cf7ed6bb766a62baa9 jdk8u262-b05
    1.20 +f6630163b3a2b7a136db8b78049f78aa491aaf69 jdk8u262-b06
    1.21 +e085d9bd4f6596c5633359d16d9bfc39ecfb1b72 jdk8u262-b07
    1.22 +18103a6d9d495506b71068e6886d436f98bb165c jdk8u262-b08
    1.23 +7348b67e1dd4786e9cd4c0472ca2802f36a2573f jdk8u262-b09

     2.1 --- a/THIRD_PARTY_README	Wed Oct 14 16:43:13 2020 +0800
     2.2 +++ b/THIRD_PARTY_README	Wed Oct 14 17:44:46 2020 +0800
     2.3 @@ -1643,7 +1643,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, 
     2.8 +%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, 
     2.9  which may be included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -2898,23 +2898,21 @@
    2.13  
    2.14  -------------------------------------------------------------------------------
    2.15  
    2.16 -%% This notice is provided with respect to X Window System 6.8.2, which may be 
    2.17 +%% This notice is provided with respect to xwd v1.0.7, which may be
    2.18  included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
    2.19  
    2.20 +xwd utility
    2.21 +
    2.22  --- begin of LICENSE ---
    2.23  
    2.24 -This is the copyright for the files in src/solaris/native/sun/awt: list.h, 
    2.25 -multiVis.h, wsutils.h, list.c, multiVis.c
    2.26 -Copyright (c) 1994 Hewlett-Packard Co.
    2.27 -Copyright (c) 1996 X Consortium
    2.28 -
    2.29 -Permission is hereby granted, free of charge, to any person obtaining
    2.30 -a copy of this software and associated documentation files (the
    2.31 -"Software"), to deal in the Software without restriction, including
    2.32 -without limitation the rights to use, copy, modify, merge, publish,
    2.33 -distribute, sublicense, and sell copies of the Software, and to
    2.34 -permit persons to whom the Software is furnished to do so, subject to
    2.35 -the following conditions:
    2.36 +Copyright 1994 Hewlett-Packard Co.
    2.37 +Copyright 1996, 1998  The Open Group
    2.38 +
    2.39 +Permission to use, copy, modify, distribute, and sell this software and its
    2.40 +documentation for any purpose is hereby granted without fee, provided that
    2.41 +the above copyright notice appear in all copies and that both that
    2.42 +copyright notice and this permission notice appear in supporting
    2.43 +documentation.
    2.44  
    2.45  The above copyright notice and this permission notice shall be included
    2.46  in all copies or substantial portions of the Software.
    2.47 @@ -2922,15 +2920,15 @@
    2.48  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    2.49  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    2.50  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
    2.51 -IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
    2.52 +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
    2.53  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
    2.54  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    2.55  OTHER DEALINGS IN THE SOFTWARE.
    2.56  
    2.57 -Except as contained in this notice, the name of the X Consortium shall
    2.58 +Except as contained in this notice, the name of The Open Group shall
    2.59  not be used in advertising or otherwise to promote the sale, use or
    2.60  other dealings in this Software without prior written authorization
    2.61 -from the X Consortium.
    2.62 +from The Open Group.
    2.63  
    2.64  --- end of LICENSE ---
    2.65  _____________________________

     3.1 --- a/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java	Wed Oct 14 16:43:13 2020 +0800
     3.2 +++ b/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java	Wed Oct 14 17:44:46 2020 +0800
     3.3 @@ -396,7 +396,8 @@
     3.4       */
     3.5      public static MemoryLayoutSpecification getEffectiveMemoryLayoutSpecification() {
     3.6          final String vmName = System.getProperty("java.vm.name");
     3.7 -        if (vmName == null || !vmName.startsWith("Java HotSpot(TM) ")) {
     3.8 +        if (vmName == null
     3.9 +            || (!vmName.startsWith("OpenJDK ") && !vmName.startsWith("Java HotSpot(TM) "))) {
    3.10              throw new UnsupportedOperationException(
    3.11                      "ObjectSizeCalculator only supported on HotSpot VM");
    3.12          }