changeset 2394:d596db32d00a jdk8u161-b12-aarch32-180220

Merge
author snazarki
date Tue, 20 Feb 2018 12:56:34 +0300
parents 3618f69a0d19 (current diff) 91668c6c6698 (diff)
children e9e8e72ffc07
files .hgtags common/autoconf/generated-configure.sh
diffstat 3 files changed, 69 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Nov 02 17:58:33 2017 +0300
+++ b/.hgtags	Tue Feb 20 12:56:34 2018 +0300
@@ -670,6 +670,8 @@
 14388b14d4847c3eacce677eae37980e6fa545cd jdk8u112-b16
 c2524804b4a742a61770174d84346f81d4979496 jdk8u112-b16-aarch32-161109
 1a7a5fe22a028e438a724d909d27da2ea96c6d86 jdk8u112-b31
+911c506096560e49442a4c8f598f7f43c2339720 jdk8u112-b32
+8e27761a403ff4b237219cfb22731e127a1d1744 jdk8u112-b33
 58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u121-b00
 a2c5309f998f8aa207a6e381464263e9a7dd50e0 jdk8u121-b01
 a2aa2e98905609a0b5809a38163239a7c97d31c1 jdk8u121-b02
@@ -685,6 +687,12 @@
 97c858f7f7c827730d05eb69134ac89e156f8685 jdk8u121-b12
 cb8f12bf1e86f046d7974b14479faa896856ee86 jdk8u121-b13-aarch32-170210
 f2b5b6ab1f5544b92074adb5bb80cc031649d0e7 jdk8u121-b13
+7cc899fc144561be76c4286b3e9ee06b1facef32 jdk8u121-b31
+6838c13eb094eeb3119decfd952dedc2f51427ed jdk8u121-b32
+77581d764b55726370f40552b32d8bdc3a12f285 jdk8u121-b33
+31e1a5ba68cd0f00585c4adea6b405d8bc166361 jdk8u121-b34
+041abd76a482e3df5dffe1b303853dae1fa52c7a jdk8u121-b35
+6b5494fc6df0c6608fe869275b188c41fe47cfdb jdk8u121-b36
 986503d59e09ac8f61bac904b0875abbe869492f jdk8u131-b00
 8d1b3d2482437ec6a0bfae10e1475fd80916ab7d jdk8u131-b01
 66811607997db903aae54676f43974c7f918da10 jdk8u131-b02
@@ -698,6 +706,10 @@
 725620ca52fbc260782c522845e310b9c9aed59a jdk8u131-b10
 393473916db47ecf370ec9ba78a6bb9d644d39ca jdk8u131-b12-aarch32-170420
 94b1198760284f6b53daa4c3361261a0a5207150 jdk8u131-b11
+26016f048003d216cdf83e1b0318b6fc988a4ca8 jdk8u131-b31
+cc52a119d110cc633dce64629d4d25b3e1cc3b67 jdk8u131-b32
+ff0e5fb867ed031ee8d629e6ddc637f92f03dc17 jdk8u131-b33
+e0c72f33efb916a8eafbca328f3f848b87383cc4 jdk8u131-b34
 756ee32cd629989dfe63c5e11dfcf2d3598543f0 jdk8u141-b00
 b174b1474d36381dadb65391ba67f8e44d14e2f6 jdk8u141-b01
 3036128430bcd058d81fe4b5bf18dc7beabd6449 jdk8u141-b02
@@ -715,12 +727,21 @@
 68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14
 ea99a8a5d3c113536aea33ce44b66e7a5e0e90aa jdk8u141-b15-aarch32-170721
 48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15
+123326194347f1778bbd124594bcddba8181d23b jdk8u141-b31
+f1021394489da9a3621ba92fd427572abb32413f jdk8u141-b32
 9a342a4d909784cccb664f2293c8cb1463c3ac41 jdk8u144-b00
 e9fd6d8adfa36b966c9a28a459bf2d94940bf27e jdk8u144-b01-aarch32-170809
 57a5aae91b8bdccc4e1910cf373f13598429f03e jdk8u144-b01
+21446f3c909e3ed750def8b4dacbec6074606ed3 jdk8u144-b31
+b032efb8a72675cfded271b99ad84602189f7849 jdk8u144-b32
+9a2e03172d83689006df0a86d89cc84cf82b7b12 jdk8u144-b33
+fe4076d1d773f63ab4ff9cc9cfc605c174a7b156 jdk8u144-b34
+123326194347f1778bbd124594bcddba8181d23b jdk8u141-b31
+f1021394489da9a3621ba92fd427572abb32413f jdk8u141-b32
 b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00
 0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01
 9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02
+00790ebdff1c5bc4cda000073b24f94dcc96e14f jdk8u161-b00
 66a82078ad5463ff048ec7b21405da3b5f62214a jdk8u151-b03
 6e00c7da6a32c0f750ccfbe4c71204eeb6cccc14 jdk8u151-b04
 6d4ab2046f26035e500924bffb49934d66aa64e3 jdk8u151-b05
@@ -760,3 +781,34 @@
 d680e12deacbc531fe647d356540384efe625223 jdk8u152-b15
 4e5c767245182cd86656554e333c5e1bb2bfef16 jdk8u152-b16-aarch32-171102
 1ebc6aea5d2905cdfc20e39c3c1cf0d240c417ad jdk8u152-b17-aarch32-171102
+7a25d12cd94fa7a881f064dcb35f0e88ed073c45 jdk8u152-b16
+b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00
+73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01
+89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02
+4cf57a6813323a1c3336bef63ca7c16d52146637 jdk8u122-b03
+4cf57a6813323a1c3336bef63ca7c16d52146637 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+b6e27dc2775764b59755eb054c66fbec9b2684b7 jdk8u122-b03
+6dd80b19838ded52371aa280cb8a68ad80aed22d jdk8u122-b04
+1e501e6d58a962a1ef5dd933dc4cce56a5358a98 jdk8u132-b00
+d15b51f1149bd1b7e87f4ec6a1bc5678c15275ef jdk8u152-b00
+b6446826930c8577c7a90009dd472b7eb813e495 jdk8u152-b01
+d7045c4d4eab5eb23ed9e43a351ff1a497ba7a7e jdk8u152-b02
+0414b34a471e1c3d277a5b0e583c6bfd9708305c jdk8u152-b03
+ea8d7d26cccae878ffed38eaa3f3c49d74c891fd jdk8u152-b04
+c23b7c1c24bf06ffa1bd52f19d541a56cdb1b350 jdk8u152-b05
+ff59566476c79e8143bf18eefb79196cc3a12994 jdk8u152-b06
+c0a2f84796bc8a55bb686069114de60a7cc2c875 jdk8u152-b07
+00790ebdff1c5bc4cda000073b24f94dcc96e14f jdk8u161-b00
+6e53d489c0a58cb548a65396ae8383a9f2e298d2 jdk8u161-b01
+d66f57333c7fcc735f87eb0903ffdc0aaf899b32 jdk8u161-b02
+33f1ededc6f79f4c1d476d63f650d020d1a68d20 jdk8u161-b03
+7b4e91fb47c3ea83ca920a0e0701a5b793674d7c jdk8u161-b04
+3024b7c1ddb2be1a3c5cfaf454226999615967a1 jdk8u161-b05
+25d390a136a346a949156772d0c0c986f815b227 jdk8u161-b06
+430b63960a8164704c76866584db14d64074d87f jdk8u161-b07
+670b9c20ae50ab3fcffcb9ac0867e3ac59714303 jdk8u161-b08
+ff7dd95280fbaf4aa23b20f50a920dbdef561d12 jdk8u161-b09
+fff44bb7f1db7d141b0039064b86340dac338d41 jdk8u161-b10
+89f84abd0219b7576fe65abbc51ac0fbcf0d5284 jdk8u161-b11
--- a/THIRD_PARTY_README	Thu Nov 02 17:58:33 2017 +0300
+++ b/THIRD_PARTY_README	Tue Feb 20 12:56:34 2018 +0300
@@ -7,7 +7,7 @@
 
 --- begin of LICENSE ---
 
-Copyright (c) 2000-2011 France Télécom
+Copyright (c) 2000-2011 France T??l??com
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -849,7 +849,7 @@
 --- begin of LICENSE ---
 
 Copyright notice
-Copyright © 2011 Ecma International
+Copyright ?? 2011 Ecma International
 Ecma International
 Rue du Rhone 114
 CH-1204 Geneva
@@ -916,7 +916,7 @@
 
 --- begin of LICENSE ---
 
-Copyright © 2001,2003 Keith Packard
+Copyright ?? 2001,2003 Keith Packard
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that the
@@ -2212,16 +2212,16 @@
 Unicode Terms of Use
 
 For the general privacy policy governing access to this site, see the Unicode
-Privacy Policy. For trademark usage, see the Unicode® Consortium Name and
+Privacy Policy. For trademark usage, see the Unicode?? Consortium Name and
 Trademark Usage Policy.
 
 A. Unicode Copyright.
-   1. Copyright © 1991-2013 Unicode, Inc. All rights reserved.
+   1. Copyright ?? 1991-2013 Unicode, Inc. All rights reserved.
 
    2. Certain documents and files on this website contain a legend indicating
       that "Modification is permitted." Any person is hereby authorized,
       without fee, to modify such documents and files to create derivative
-      works conforming to the Unicode® Standard, subject to Terms and
+      works conforming to the Unicode?? Standard, subject to Terms and
       Conditions herein.
 
     3. Any person is hereby authorized, without fee, to view, use, reproduce,
@@ -2287,14 +2287,14 @@
 
 E.Trademarks & Logos.
    1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode,
-      Inc.  “The Unicode Consortium” and “Unicode, Inc.” are trade names of
+      Inc.  ???The Unicode Consortium??? and ???Unicode, Inc.??? are trade names of
       Unicode, Inc.  Use of the information and materials found on this
-      website indicates your acknowledgement of Unicode, Inc.’s exclusive
+      website indicates your acknowledgement of Unicode, Inc.???s exclusive
       worldwide rights in the Unicode Word Mark, the Unicode Logo, and the
       Unicode trade names.
 
-   2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark
-      Policy”) are incorporated herein by reference and you agree to abide by
+   2. The Unicode Consortium Name and Trademark Usage Policy (???Trademark
+      Policy???) are incorporated herein by reference and you agree to abide by
       the provisions of the Trademark Policy, which may be changed from time
       to time in the sole discretion of Unicode, Inc.
 
@@ -2317,12 +2317,12 @@
 
    2. Modification by Unicode.  Unicode shall have the right to modify this
       Agreement at any time by posting it to this site. The user may not
-      assign any part of this Agreement without Unicode’s prior written
+      assign any part of this Agreement without Unicode???s prior written
       consent.
 
    3. Taxes. The user agrees to pay any taxes arising from access to this
       website or use of the information herein, except for those based on
-      Unicode’s net income.
+      Unicode???s net income.
 
    4. Severability.  If any provision of this Agreement is declared invalid or
       unenforceable, the remaining provisions of this Agreement shall remain
@@ -2351,7 +2351,7 @@
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the
+Copyright ?? 1991-2012 Unicode, Inc. All rights reserved. Distributed under the
 Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/common/autoconf/generated-configure.sh	Thu Nov 02 17:58:33 2017 +0300
+++ b/common/autoconf/generated-configure.sh	Tue Feb 20 12:56:34 2018 +0300
@@ -3837,7 +3837,7 @@
 
 
 # TOOLCHAIN_C_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
-#                                   [RUN-IF-FALSE])
+#                                      [RUN-IF-FALSE])
 # ------------------------------------------------------------
 # Check that the C compiler supports an argument
 
@@ -3912,7 +3912,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1500960571
+DATE_WHEN_GENERATED=1501170108
 
 ###############################################################################
 #
@@ -8024,10 +8024,10 @@
 
 
   INCLUDE_SA=true
-  if test "x$JVM_VARIANT_ZERO" = xtrue; then
+  if test "x$JVM_VARIANT_ZERO" = xtrue ; then
     INCLUDE_SA=false
   fi
-  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
+  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
     INCLUDE_SA=false
   fi
   if test "x$OPENJDK_TARGET_CPU" = xppc64; then