# HG changeset patch # User adinn # Date 1437402165 -3600 # Node ID d00df0227041fda1da87fc1baa9721914297d239 # Parent b667572a24c52f2e58c17efc85877986c296ed74# Parent be2ddf520d263ea27a075f895d93adada6702027 Merge diff -r b667572a24c5 -r d00df0227041 .hgtags --- a/.hgtags Tue Jun 30 16:16:21 2015 +0100 +++ b/.hgtags Mon Jul 20 15:22:45 2015 +0100 @@ -363,6 +363,7 @@ fde671d8b2537b6be61f67e583164b5b8b33ac5b jdk8u31-b13 a198f93b1e0be5edce7a351b1399cb5c4e64c8f4 jdk8u31-b31 99c79d83152585991682bd86e21fdcfe6f6ab9b2 jdk8u31-b32 +cf4ebf47413902376f66d2cddaf0282d49699ba7 jdk8u31-b33 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01 91ba3391548717179e62e08a2d2bd6b8cc774a6d jdk8u40-b02 @@ -391,6 +392,8 @@ e26f15704e37f28acebb22378c4785891aaec637 jdk8u40-b25 7a552439756eaad0618ae82a94c034edb65f5d7e jdk8u40-b26 12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27 +eee2ebbb97f136cd458d4f3a825ee40d0046f425 jdk8u40-b31 +b92f3d486e47d29dfb1ea2096db295077328368e jdk8u40-b32 ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00 635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01 801c65bb74b770600a2d48189764e416e5cfe265 jdk8u45-b02 @@ -406,6 +409,26 @@ 54709b761404dd3bc1b58acf5582fa9bd70ff59a jdk8u45-b12 6b2f1bf5c72873d01b37103fc20ac7a63e7881dd jdk8u45-b13 15b679d327da9ee99c05d7ddd75512ce335d5994 jdk8u45-b14 +438cc91b51330a61a790f0a0ac64816b565d25f0 jdk8u45-b15 +5a4ccc33ab26b635f91ddd424742b0009a37bcc0 jdk8u45-b31 +4597cb5171773416c4b2e1843db8592a69ff7a99 jdk8u45-b32 +a1682688c9aec33c172146ce4be8d3969e7d76bb jdk8u51-b00 +e04f2ee2d03d9927d2012286a9bcbf511eb887ae jdk8u51-b01 +4dee64570ad013eb5e1cb16304f9eff558c1c5e9 jdk8u51-b02 +df8e9cbe5a8a7ce9cf2e0a78910302d08e2dbb53 jdk8u51-b03 +1d29a8f9bd262c4f3556e0250db80d8dc64d95d3 jdk8u51-b04 +046d1cfaedc892bfd49570d42dd655338278d476 jdk8u51-b05 +7875bd6e35fb6af4b150dda213d7812bdb9fcba1 jdk8u51-b06 +2c7a34442763e809d2cf1459d5b8d6d5528f6494 jdk8u51-b07 +a96b442d99131e87c7c974a0fa277a5f971732c6 jdk8u51-b08 +3a95f1e13da9720a6243c0bd41688544b037e182 jdk8u51-b09 +d99f3f935397fdc65dcb776a97110e8ff5cc519c jdk8u51-b10 +29612174658436601ba833993227ae96117f632c jdk8u51-b11 +f07a9ef02d513435e19fd70abcce2871d1c91342 jdk8u51-b12 +6ef21f3e0946aaab8dc1f4e9cad21dacb97c4f8c jdk8u51-b13 +5a2078b398485d21fa6577cf9481aa488d2e28d0 jdk8u51-b14 +54b6481aa9e2f39699a96a4572b825b6d81f434f jdk8u51-b15 +3ee37a71b2ab50e1e47febab6b69771b6846ba6b jdk8u51-b16 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00 acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01 2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02 @@ -427,3 +450,7 @@ d1d9eb953fbbe1f63a6badb0742508ae5f0d3ab5 jdk8u60-b18 ff2ddaa4ea3292e2f0931a9a0c3feb33288d7d7f jdk8u60-b19 c641f979dff0d28dcdc4f303e9d93dda3079a456 jdk8u60-b20 +99d323d5830fad8551038da15113639d8518a8e6 jdk8u60-b21 +01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u60-b22 +91e6153db0df9245c4b60197c78f72e510026b2c jdk8u60-b23 +280834e00e6267fae1ae2a86a8bd7d1fdd160cba jdk8u60-b24 diff -r b667572a24c5 -r d00df0227041 THIRD_PARTY_README --- a/THIRD_PARTY_README Tue Jun 30 16:16:21 2015 +0100 +++ b/THIRD_PARTY_README Mon Jul 20 15:22:45 2015 +0100 @@ -1140,37 +1140,6 @@ -------------------------------------------------------------------------------- -%% This notice is provided with respect to JSON, which may be included -with JRE 8 & JDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - %% This notice is provided with respect to Kerberos functionality, which which may be included with JRE 8, JDK 8, and OpenJDK 8. @@ -1250,7 +1219,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.6.16, which may be +%% This notice is provided with respect to libpng 1.6.16, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1370,7 +1339,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libungif 4.1.3, which may be +%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1399,13 +1368,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to Little CMS 2.5, which may be +%% This notice is provided with respect to Little CMS 2.7, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- Little CMS -Copyright (c) 1998-2011 Marti Maria Saguer +Copyright (c) 1998-2015 Marti Maria Saguer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -r b667572a24c5 -r d00df0227041 make/common/NativeCompilation.gmk --- a/make/common/NativeCompilation.gmk Tue Jun 30 16:16:21 2015 +0100 +++ b/make/common/NativeCompilation.gmk Mon Jul 20 15:22:45 2015 +0100 @@ -323,6 +323,13 @@ $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) endif + ifeq ($$($1_CXXFLAGS),) + $1_CXXFLAGS:=$$($1_CFLAGS) + endif + ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) + $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) + endif + ifneq (,$$($1_DEBUG_SYMBOLS)) ifeq ($(ENABLE_DEBUG_SYMBOLS), true) ifdef OPENJDK @@ -340,13 +347,6 @@ endif endif - ifeq ($$($1_CXXFLAGS),) - $1_CXXFLAGS:=$$($1_CFLAGS) - endif - ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) - $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) - endif - ifneq (,$$($1_REORDER)) $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER) $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)