Mercurial > hg > icedtea8-forest > nashorn
changeset 2631:64ff8f8e38d2
Merge jdk8u262-ga
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 04 Sep 2020 17:46:09 +0100 |
| parents | a554bbb4e939 (current diff) 15fcd98e96ac (diff) |
| children | 3c07ff843d55 |
| files | .hgtags |
| diffstat | 3 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Aug 31 03:16:23 2020 +0100 +++ b/.hgtags Fri Sep 04 17:46:09 2020 +0100 @@ -1140,3 +1140,12 @@ 1d70dcb4ab539aa8f0e3e49c1c6b97d9ff286eaf icedtea-3.16.0 1d70dcb4ab539aa8f0e3e49c1c6b97d9ff286eaf icedtea-3.17.0pre00 36e295162ff1baa0b709d4d5880449f758558342 icedtea-3.17.0pre01 +0a00f1ccd7e96bcd7eb102b510fc1e639e0c554b jdk8u262-b01 +60239ecaefa22c4f415c3170fe93065f344bf15b jdk8u262-b02 +0b39fe441888452aa6a7aabef856c23e8cabf9ff jdk8u262-b03 +eef87c0da03ebb76368edb3195c1c5924edda265 jdk8u262-b04 +e2a7c53cfa4d3c689bb819cf7ed6bb766a62baa9 jdk8u262-b05 +f6630163b3a2b7a136db8b78049f78aa491aaf69 jdk8u262-b06 +e085d9bd4f6596c5633359d16d9bfc39ecfb1b72 jdk8u262-b07 +18103a6d9d495506b71068e6886d436f98bb165c jdk8u262-b08 +7348b67e1dd4786e9cd4c0472ca2802f36a2573f jdk8u262-b09
--- a/THIRD_PARTY_README Mon Aug 31 03:16:23 2020 +0100 +++ b/THIRD_PARTY_README Fri Sep 04 17:46:09 2020 +0100 @@ -1643,7 +1643,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, +%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE ---
--- a/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java Mon Aug 31 03:16:23 2020 +0100 +++ b/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java Fri Sep 04 17:46:09 2020 +0100 @@ -396,7 +396,8 @@ */ public static MemoryLayoutSpecification getEffectiveMemoryLayoutSpecification() { final String vmName = System.getProperty("java.vm.name"); - if (vmName == null || !vmName.startsWith("Java HotSpot(TM) ")) { + if (vmName == null + || (!vmName.startsWith("OpenJDK ") && !vmName.startsWith("Java HotSpot(TM) "))) { throw new UnsupportedOperationException( "ObjectSizeCalculator only supported on HotSpot VM"); }