Mercurial > hg > icedtea8-forest
changeset 1801:93f2944dcec6 icedtea-3.1.0pre01
Merge jdk8u92-b14
author | andrew |
---|---|
date | Mon, 09 May 2016 04:36:40 +0100 |
parents | adf56f42ce54 (current diff) 51f64c980bcd (diff) |
children | 2f53f7897140 |
files | .hgtags common/autoconf/generated-configure.sh common/autoconf/hotspot-spec.gmk.in common/autoconf/platform.m4 |
diffstat | 4 files changed, 47 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon May 09 02:47:59 2016 +0100 +++ b/.hgtags Mon May 09 04:36:40 2016 +0100 @@ -437,6 +437,7 @@ 58f6ddf5d59fffc52d190d82890ba25698fb80e3 jdk8u51-b31 3dcabe6d7fdd37e73ebdd82d414c4939a50b58b7 jdk8u51-b32 586cfdfb13dd3f3b787d4fc1de7a03abd3a2457d jdk8u51-b33 +ad2f7ed088f1ce14564e573611c2d10635fbfab3 jdk8u51-b34 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00 acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01 2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02 @@ -506,6 +507,11 @@ 6eab3ce957aa560f8f9080a2c9535d1ee70fc834 jdk8u66-b17 a482cd45f31d7bf4ffc77acace705a0b9f888489 jdk8u66-b18 e6361dcd087eef288fdeeaa17c2dbf9aa4793d5d jdk8u66-b31 +b0bbac715f3bcefc57350b653decd9806144288a jdk8u66-b32 +75d6658e00b4115648b643dcad86a6879c9c94f3 jdk8u66-b33 +2a363653a0918df1eb369f6dc637258afeb6f7d1 jdk8u66-b34 +1719690a0ee77b273a487bcc4a38a721cee3785b jdk8u66-b35 +07707d0f0c781e37bc6897e9d89136e869840969 jdk8u66-b36 ab2d570584a2bb01a6fedf7bd483443fdfc3d799 jdk8u71-b00 1956eeeaed470cc9b46addabceb91c9900f2f83a jdk8u71-b01 b9c864410397ae0e23219b8ab218c33c9859c592 jdk8u71-b02 @@ -545,9 +551,41 @@ 87614decb34cd6076f136b6d51be83f13e3e6aed jdk8u74-b00 33b310c85259e0d7ed112ab2e01008228e263371 jdk8u74-b01 bee679b986f51fe4d65d6df11fea93d1543b6502 jdk8u74-b02 +928374287059bb10b87dade1c2d984f8c4df01b3 jdk8u72-b31 +ac4e9dfd23236821432786b27566fa2f800aa3d4 jdk8u75-b00 +d63a77fb06149b75dbb043a175a9c4a906ac26ef jdk8u75-b01 +320f984ac52b56da66aff581a2c4830eadc0404e jdk8u75-b02 +53dc743a34f164a9eb4e336f90cb21a58291a0b1 jdk8u75-b03 +722fc7e276ff8b4b6460b399e4eb65da518435f0 jdk8u75-b04 +57f1232cccbdfb8716f7258bc42982eb3e236e51 jdk8u75-b05 +9ea73143a5184a4034a1276733a9f9f356b67278 jdk8u75-b06 +ab064675c0669fd31bc7c424611686fe73c1509f jdk8u75-b07 +af84471ad4fd4e474ce984440718d87a386df4a8 jdk8u75-b08 +22ba4f1ad75c80bf78539f4c80b9867d227184d3 jdk8u75-b09 +9da1d3f8905be682e33579857dd7b176f847e938 jdk8u75-b10 +d8708cd521ff11851b259cd1171e8f18b90564a1 jdk8u75-b12 417ff12d11d60c7f2235b498fdea9ef85514fc75 jdk8u77-b00 6683e1d7422d0b6fc6566a1454604ca1ba7e86d9 jdk8u77-b01 7dd1be8bd46cd4c80526671607e8035c3c671c14 jdk8u77-b02 19d738ae2def4918d5a7aff721e6651a671b4064 icedtea-3.0.0pre10 8ed8d26a3f9ad84b2901948eaaf255aacdecdce1 icedtea-3.0.0 d8400e834cba3c4402e6d0920a46d5908466bdfd icedtea-3.0-branchpoint +3fbef9f4cddf934f9cc0e06f61e641b5b845b901 jdk8u77-b03 +4c41657db1862352b0e107b910be32c86eb5b1ff jdk8u91-b00 +0c798868f18548af144de0f0ab69f09a4c968cd2 jdk8u91-b13 +5744173381186940733aecf7904053ba6e83180e jdk8u91-b14 +e8bed1496ff254d91d52c8da7c6d8d361862d773 jdk8u76-b00 +832508a6165c877aa1de03ca9b6520c7bfe5a28e jdk8u76-b01 +0861105394355ad24c07cb2ff58a731ef91502a8 jdk8u76-b02 +4db8c011697524c7ba76fb317763940d85af0c12 jdk8u76-b03 +120282f77af0321604f51edcbcd368aff23b42b7 jdk8u76-b04 +7cc0806883e51bdf966e155bb4bb5397bf7005fa jdk8u76-b05 +3614fb87088c7c5990daff20dd39845d58c86b1e jdk8u76-b06 +62e05c53156767c2398381d527e4e204d09dfa40 jdk8u76-b07 +ca4f552fb08f4420f478d7a86098e540ddf91b31 jdk8u76-b08 +b5e3d2c78818af23d855cb10bac51fab5b7b2884 jdk8u76-b09 +2377ea341a26d0a6875f148dc555811bdf2e9533 jdk8u76-b10 +94746373e4d5590536bacb0df4a19188e4d1bdd8 jdk8u76-b11 +9f2404d26c945178219c4f826fee5a084896ba55 jdk8u76-b12 +118aba9e37f0264a7cadb20ac0438eaea4180998 jdk8u92-b00 +94158f2e5cbdff8956b8e643e0305ca178d856e3 jdk8u92-b13
--- a/common/autoconf/generated-configure.sh Mon May 09 02:47:59 2016 +0100 +++ b/common/autoconf/generated-configure.sh Mon May 09 04:36:40 2016 +0100 @@ -3711,7 +3711,7 @@ # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ -3919,7 +3919,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1459480380 +DATE_WHEN_GENERATED=1462759175 ############################################################################### # @@ -6911,7 +6911,7 @@ VAR_CPU_BITS=32 VAR_CPU_ENDIAN=big ;; - sparcv9) + sparcv9|sparc64) VAR_CPU=sparcv9 VAR_CPU_ARCH=sparc VAR_CPU_BITS=64 @@ -7056,7 +7056,7 @@ VAR_CPU_BITS=32 VAR_CPU_ENDIAN=big ;; - sparcv9) + sparcv9|sparc64) VAR_CPU=sparcv9 VAR_CPU_ARCH=sparc VAR_CPU_BITS=64
--- a/common/autoconf/hotspot-spec.gmk.in Mon May 09 02:47:59 2016 +0100 +++ b/common/autoconf/hotspot-spec.gmk.in Mon May 09 04:36:40 2016 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ -69,8 +69,8 @@ # Yet another name for arch used for an extra subdir below the jvm lib. # Uses i386 and amd64, instead of x86 and x86_64. LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB) -# Old name for OPENJDK_TARGET_CPU, uses i586 and amd64, instead of x86 and x86_64. -ARCH=$(OPENJDK_TARGET_CPU_LEGACY) +# Set the cpu architecture +ARCH=$(OPENJDK_TARGET_CPU_ARCH) # ppc64le uses the HotSpot ppc64 build ifeq ($(OPENJDK_TARGET_CPU), ppc64le) ARCH=ppc64
--- a/common/autoconf/platform.m4 Mon May 09 02:47:59 2016 +0100 +++ b/common/autoconf/platform.m4 Mon May 09 04:36:40 2016 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ -90,7 +90,7 @@ VAR_CPU_BITS=32 VAR_CPU_ENDIAN=big ;; - sparcv9) + sparcv9|sparc64) VAR_CPU=sparcv9 VAR_CPU_ARCH=sparc VAR_CPU_BITS=64