changeset 2375:18c380fead4d jdk8u102-b14-aarch32-160812

Merge
author snazarki
date Fri, 12 Aug 2016 18:10:27 +0300
parents 5c86aad667c7 (current diff) daafd7d3a76a (diff)
children 2c56ff57079c
files .hgtags common/autoconf/generated-configure.sh common/autoconf/platform.m4
diffstat 4 files changed, 75 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue May 10 09:03:37 2016 +0100
+++ b/.hgtags	Fri Aug 12 18:10:27 2016 +0300
@@ -386,6 +386,7 @@
 12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27
 eee2ebbb97f136cd458d4f3a825ee40d0046f425 jdk8u40-b31
 b92f3d486e47d29dfb1ea2096db295077328368e jdk8u40-b32
+8b3c10f939d77adacf2a3ff7510de66bd024cfe4 jdk8u40-b33
 ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
 635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01
 801c65bb74b770600a2d48189764e416e5cfe265 jdk8u45-b02
@@ -533,17 +534,29 @@
 8f5ca46a90af013525cbdf3b023727450cdb8119 jdk8u72-b13
 6cbd347daa9367b78e385f2e8eba222a30b3bea1 jdk8u72-b14
 fff0c11d2811deb70bef213d6d8478b3e3796658 jdk8u72-b15
+928374287059bb10b87dade1c2d984f8c4df01b3 jdk8u72-b31
 443abbc4e048b13e075486a86ddafca520257fdf jdk8u73-b00
 fc0ed68cbc5cbdb2efdb75f3309b5de2a64f5a57 jdk8u73-b01
 6aacbee7e4c84a30761faf58a682b07b8bdf54da jdk8u73-b02
 87614decb34cd6076f136b6d51be83f13e3e6aed jdk8u74-b00
 33b310c85259e0d7ed112ab2e01008228e263371 jdk8u74-b01
 bee679b986f51fe4d65d6df11fea93d1543b6502 jdk8u74-b02
+fd813938f2dd5f8e9d7caa2c1628af6da6683831 jdk8u74-b31
+9d7c49d756f01acbcbe8d0d3c5d5d4e92a7cf119 jdk8u74-b32
 928374287059bb10b87dade1c2d984f8c4df01b3 jdk8u72-b31
+443abbc4e048b13e075486a86ddafca520257fdf jdk8u73-b00
+fc0ed68cbc5cbdb2efdb75f3309b5de2a64f5a57 jdk8u73-b01
+6aacbee7e4c84a30761faf58a682b07b8bdf54da jdk8u73-b02
+87614decb34cd6076f136b6d51be83f13e3e6aed jdk8u74-b00
+33b310c85259e0d7ed112ab2e01008228e263371 jdk8u74-b01
+bee679b986f51fe4d65d6df11fea93d1543b6502 jdk8u74-b02
+fd813938f2dd5f8e9d7caa2c1628af6da6683831 jdk8u74-b31
+9d7c49d756f01acbcbe8d0d3c5d5d4e92a7cf119 jdk8u74-b32
 ac4e9dfd23236821432786b27566fa2f800aa3d4 jdk8u75-b00
 d63a77fb06149b75dbb043a175a9c4a906ac26ef jdk8u75-b01
 320f984ac52b56da66aff581a2c4830eadc0404e jdk8u75-b02
 53dc743a34f164a9eb4e336f90cb21a58291a0b1 jdk8u75-b03
+722fc7e276ff8b4b6460b399e4eb65da518435f0 jdk8u101-b00
 722fc7e276ff8b4b6460b399e4eb65da518435f0 jdk8u75-b04
 57f1232cccbdfb8716f7258bc42982eb3e236e51 jdk8u75-b05
 9ea73143a5184a4034a1276733a9f9f356b67278 jdk8u75-b06
@@ -556,6 +569,60 @@
 6683e1d7422d0b6fc6566a1454604ca1ba7e86d9 jdk8u77-b01
 7dd1be8bd46cd4c80526671607e8035c3c671c14 jdk8u77-b02
 3fbef9f4cddf934f9cc0e06f61e641b5b845b901 jdk8u77-b03
+08dc508915433fdf3d970ea4d2fd33b4dffd67ca jdk8u77-b31
 4c41657db1862352b0e107b910be32c86eb5b1ff jdk8u91-b00
 0c798868f18548af144de0f0ab69f09a4c968cd2 jdk8u91-b13
 4f7190b27caad1aaf7c033b280dc11fa3b1465d9 jdk8u91-b14-aarch32-160510
+5744173381186940733aecf7904053ba6e83180e jdk8u91-b14
+dca1ae1fd0fdb55a4fa12f58726a1fa7086e7ae0 jdk8u91-b15
+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
+51f64c980bcdef152a6eb043aaa5d04cc08c6624 jdk8u92-b14
+9005b6faa5f616a8b403ea3aa660b963a7cdde24 jdk8u92-b31
+722fc7e276ff8b4b6460b399e4eb65da518435f0 jdk8u81-b00
+534d4e07c81fc8656cdb0856e22aafbdc54e474a jdk8u101-b01
+18e1f0ee965b0565514027543546348ed99bf4a4 jdk8u101-b02
+fe138c6f5aa8455ee704e58d7d7ffc90fdd230c3 jdk8u101-b03
+fe901996777f50198be2c785cd7e3b8198692bbe jdk8u101-b04
+9c51e0213472d584b91cf42c4c454c1caf7dbaf4 jdk8u101-b05
+1babb07d0e02471f947b9166f869720e3ae805ab jdk8u101-b06
+93e821287367a5bccbae1cfef8d3ce6c8f632d03 jdk8u101-b07
+7ede5c151d790625552ed9c683844be820d9277b jdk8u101-b08
+0b1358bc93ca7a30bab6cf2d7da09bb5a11f5a93 jdk8u101-b09
+1db5081d8ee77caffa0f534496af5fb908e9b61f jdk8u101-b10
+81cdb3e279f8f245f740e7d3e79a1629b6599325 jdk8u101-b11
+d6f920823feb4d44e67cec383d8c6e4a5dba9d76 jdk8u101-b12
+e983a19c64390d18004d1d0c7907394714e697b3 jdk8u101-b13
+e8bed1496ff254d91d52c8da7c6d8d361862d773 jdk8u76-b00
+832508a6165c877aa1de03ca9b6520c7bfe5a28e jdk8u76-b01
+0861105394355ad24c07cb2ff58a731ef91502a8 jdk8u76-b02
+4db8c011697524c7ba76fb317763940d85af0c12 jdk8u76-b03
+120282f77af0321604f51edcbcd368aff23b42b7 jdk8u76-b04
+f6d50bd27913fe801a6ec445437d7503b458a422 jdk8u102-b00
+f6d50bd27913fe801a6ec445437d7503b458a422 jdk8u82-b00
+c0b0fb35c047fe3a654c5899e7204e9c68de532a jdk8u102-b01
+914eb7d20df00012875ddd3a26c2452671c6134c jdk8u102-b02
+c3596cd9b5c8a3774e6f200ac8d055b031a5e25b jdk8u102-b03
+067570c5c0b2604ff422d2eee6f07dfc4953e44a jdk8u102-b04
+9c5541aa49f4a6bd7206085be175bf4d6a5294e9 jdk8u102-b05
+b1de940771d47cbc7b9702fea16efda94b7fa654 jdk8u102-b06
+f428f6a9060b1ac1dad41ee8a3850efdeb564bc4 jdk8u102-b07
+6bef5f85b095d712cbab5c8cbaf8330036e8593b jdk8u102-b08
+3489cf2e35b743ab5d122136e7af46895bb9739c jdk8u102-b09
+96dac192aa74ccefa6fe7a7984ac3f8acabe5dc2 jdk8u102-b10
+5839c5f4292a8755a4c102cb0f983536f5bfe8be jdk8u102-b11
+163dc486915300b020f203e89fdf1985cc3c4814 jdk8u102-b12
+04471bfd1cc2e8f4d8d198e79b21e64dd4499db8 jdk8u102-b13
--- a/common/autoconf/generated-configure.sh	Tue May 10 09:03:37 2016 +0100
+++ b/common/autoconf/generated-configure.sh	Fri Aug 12 18:10:27 2016 +0300
@@ -3880,7 +3880,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1451436803
+DATE_WHEN_GENERATED=1449096260
 
 ###############################################################################
 #
@@ -6878,7 +6878,7 @@
       VAR_CPU_BITS=32
       VAR_CPU_ENDIAN=big
       ;;
-    sparcv9)
+    sparcv9|sparc64)
       VAR_CPU=sparcv9
       VAR_CPU_ARCH=sparc
       VAR_CPU_BITS=64
@@ -7021,7 +7021,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	Tue May 10 09:03:37 2016 +0100
+++ b/common/autoconf/hotspot-spec.gmk.in	Fri Aug 12 18:10:27 2016 +0300
@@ -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)
 # Legacy setting for building for a 64 bit machine.
 # If yes then this expands to _LP64:=1
 @LP64@
--- a/common/autoconf/platform.m4	Tue May 10 09:03:37 2016 +0100
+++ b/common/autoconf/platform.m4	Fri Aug 12 18:10:27 2016 +0300
@@ -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
@@ -96,7 +96,7 @@
       VAR_CPU_BITS=32
       VAR_CPU_ENDIAN=big
       ;;
-    sparcv9)
+    sparcv9|sparc64)
       VAR_CPU=sparcv9
       VAR_CPU_ARCH=sparc
       VAR_CPU_BITS=64