changeset 2389:1c6bc8466f2f jdk8u151-b12-aarch32-171102

Merge
author snazarki
date Thu, 02 Nov 2017 15:43:56 +0300
parents fa6d27e294f3 (current diff) 27cf3b167362 (diff)
children 906eecf41d9c
files .hgtags common/autoconf/generated-configure.sh
diffstat 3 files changed, 19 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Aug 09 13:28:42 2017 +0300
+++ b/.hgtags	Thu Nov 02 15:43:56 2017 +0300
@@ -717,3 +717,16 @@
 48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15
 9a342a4d909784cccb664f2293c8cb1463c3ac41 jdk8u144-b00
 e9fd6d8adfa36b966c9a28a459bf2d94940bf27e jdk8u144-b01-aarch32-170809
+57a5aae91b8bdccc4e1910cf373f13598429f03e jdk8u144-b01
+b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00
+0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01
+9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02
+66a82078ad5463ff048ec7b21405da3b5f62214a jdk8u151-b03
+6e00c7da6a32c0f750ccfbe4c71204eeb6cccc14 jdk8u151-b04
+6d4ab2046f26035e500924bffb49934d66aa64e3 jdk8u151-b05
+2edf82f6996ed27adb82dec2e3ce880134a98cc6 jdk8u151-b06
+9f271942852d8bc7de6c282307ffec3c92518f7d jdk8u151-b07
+1be5e74bfdf0c42ef5746b63b39a8ac139a063f7 jdk8u151-b08
+dd863a7bde3f0a335b99c9205af84a404fc55488 jdk8u151-b09
+af89399e4d1190c42e23b95da79800da51b40808 jdk8u151-b10
+ace131d990fdb75a6616f18265b2c4ecca2e3f5d jdk8u151-b11
--- a/THIRD_PARTY_README	Wed Aug 09 13:28:42 2017 +0300
+++ b/THIRD_PARTY_README	Thu Nov 02 15:43:56 2017 +0300
@@ -2808,12 +2808,12 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.8, which may be included 
+%% This notice is provided with respect to zlib v1.2.11, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-  version 1.2.8, April 28th, 2013
+  version 1.2.11, January 15th, 2017
 
   Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
--- a/common/autoconf/generated-configure.sh	Wed Aug 09 13:28:42 2017 +0300
+++ b/common/autoconf/generated-configure.sh	Thu Nov 02 15:43:56 2017 +0300
@@ -3672,7 +3672,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
@@ -3880,7 +3880,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1476265373
+DATE_WHEN_GENERATED=1500922661
 
 ###############################################################################
 #
@@ -7992,10 +7992,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