Thu, 09 Jul 2015 22:43:14 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jul 06 12:23:46 2015 -0700 1.2 +++ b/.hgtags Thu Jul 09 22:43:14 2015 -0700 1.3 @@ -425,6 +425,7 @@ 1.4 5a2078b398485d21fa6577cf9481aa488d2e28d0 jdk8u51-b14 1.5 54b6481aa9e2f39699a96a4572b825b6d81f434f jdk8u51-b15 1.6 3ee37a71b2ab50e1e47febab6b69771b6846ba6b jdk8u51-b16 1.7 +58f6ddf5d59fffc52d190d82890ba25698fb80e3 jdk8u51-b31 1.8 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00 1.9 acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01 1.10 2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02 1.11 @@ -447,6 +448,8 @@ 1.12 ff2ddaa4ea3292e2f0931a9a0c3feb33288d7d7f jdk8u60-b19 1.13 c641f979dff0d28dcdc4f303e9d93dda3079a456 jdk8u60-b20 1.14 99d323d5830fad8551038da15113639d8518a8e6 jdk8u60-b21 1.15 +01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u60-b22 1.16 +91e6153db0df9245c4b60197c78f72e510026b2c jdk8u60-b23 1.17 45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u52-b06 1.18 2b07cd3f89aab19a2f7f119f3d885b776342efcc jdk8u52-b07 1.19 45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u65-b00
2.1 --- a/THIRD_PARTY_README Mon Jul 06 12:23:46 2015 -0700 2.2 +++ b/THIRD_PARTY_README Thu Jul 09 22:43:14 2015 -0700 2.3 @@ -1140,37 +1140,6 @@ 2.4 2.5 -------------------------------------------------------------------------------- 2.6 2.7 -%% This notice is provided with respect to JSON, which may be included 2.8 -with JRE 8 & JDK 8. 2.9 - 2.10 ---- begin of LICENSE --- 2.11 - 2.12 -Copyright (c) 2002 JSON.org 2.13 - 2.14 -Permission is hereby granted, free of charge, to any person obtaining a copy 2.15 -of this software and associated documentation files (the "Software"), to deal 2.16 -in the Software without restriction, including without limitation the rights 2.17 -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 2.18 -copies of the Software, and to permit persons to whom the Software is 2.19 -furnished to do so, subject to the following conditions: 2.20 - 2.21 -The above copyright notice and this permission notice shall be included in all 2.22 -copies or substantial portions of the Software. 2.23 - 2.24 -The Software shall be used for Good, not Evil. 2.25 - 2.26 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 2.27 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 2.28 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 2.29 -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 2.30 -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 2.31 -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 2.32 -SOFTWARE. 2.33 - 2.34 ---- end of LICENSE --- 2.35 - 2.36 -------------------------------------------------------------------------------- 2.37 - 2.38 %% This notice is provided with respect to Kerberos functionality, which 2.39 which may be included with JRE 8, JDK 8, and OpenJDK 8. 2.40 2.41 @@ -1250,7 +1219,7 @@ 2.42 2.43 ------------------------------------------------------------------------------- 2.44 2.45 -%% This notice is provided with respect to libpng 1.6.16, which may be 2.46 +%% This notice is provided with respect to libpng 1.6.16, which may be 2.47 included with JRE 8, JDK 8, and OpenJDK 8. 2.48 2.49 --- begin of LICENSE --- 2.50 @@ -1370,7 +1339,7 @@ 2.51 2.52 ------------------------------------------------------------------------------- 2.53 2.54 -%% This notice is provided with respect to libungif 4.1.3, which may be 2.55 +%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be 2.56 included with JRE 8, JDK 8, and OpenJDK 8. 2.57 2.58 --- begin of LICENSE --- 2.59 @@ -1399,13 +1368,13 @@ 2.60 2.61 ------------------------------------------------------------------------------- 2.62 2.63 -%% This notice is provided with respect to Little CMS 2.5, which may be 2.64 +%% This notice is provided with respect to Little CMS 2.7, which may be 2.65 included with JRE 8, JDK 8, and OpenJDK 8. 2.66 2.67 --- begin of LICENSE --- 2.68 2.69 Little CMS 2.70 -Copyright (c) 1998-2011 Marti Maria Saguer 2.71 +Copyright (c) 1998-2015 Marti Maria Saguer 2.72 2.73 Permission is hereby granted, free of charge, to any person obtaining a copy 2.74 of this software and associated documentation files (the "Software"), to deal
3.1 --- a/make/common/NativeCompilation.gmk Mon Jul 06 12:23:46 2015 -0700 3.2 +++ b/make/common/NativeCompilation.gmk Thu Jul 09 22:43:14 2015 -0700 3.3 @@ -323,6 +323,13 @@ 3.4 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) 3.5 endif 3.6 3.7 + ifeq ($$($1_CXXFLAGS),) 3.8 + $1_CXXFLAGS:=$$($1_CFLAGS) 3.9 + endif 3.10 + ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) 3.11 + $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) 3.12 + endif 3.13 + 3.14 ifneq (,$$($1_DEBUG_SYMBOLS)) 3.15 ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 3.16 ifdef OPENJDK 3.17 @@ -340,13 +347,6 @@ 3.18 endif 3.19 endif 3.20 3.21 - ifeq ($$($1_CXXFLAGS),) 3.22 - $1_CXXFLAGS:=$$($1_CFLAGS) 3.23 - endif 3.24 - ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) 3.25 - $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) 3.26 - endif 3.27 - 3.28 ifneq (,$$($1_REORDER)) 3.29 $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER) 3.30 $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)