Mercurial > hg > openjdk > jdk8u
changeset 1506:5476dd40852d jdk8u65-b05
Merge
| author | asaha |
|---|---|
| date | Thu, 09 Jul 2015 22:43:14 -0700 |
| parents | 3471abd0f61a (current diff) c81d9dd0e067 (diff) |
| children | ab2d570584a2 |
| files | .hgtags |
| diffstat | 3 files changed, 14 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 06 12:23:46 2015 -0700 +++ b/.hgtags Thu Jul 09 22:43:14 2015 -0700 @@ -425,6 +425,7 @@ 5a2078b398485d21fa6577cf9481aa488d2e28d0 jdk8u51-b14 54b6481aa9e2f39699a96a4572b825b6d81f434f jdk8u51-b15 3ee37a71b2ab50e1e47febab6b69771b6846ba6b jdk8u51-b16 +58f6ddf5d59fffc52d190d82890ba25698fb80e3 jdk8u51-b31 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00 acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01 2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02 @@ -447,6 +448,8 @@ ff2ddaa4ea3292e2f0931a9a0c3feb33288d7d7f jdk8u60-b19 c641f979dff0d28dcdc4f303e9d93dda3079a456 jdk8u60-b20 99d323d5830fad8551038da15113639d8518a8e6 jdk8u60-b21 +01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u60-b22 +91e6153db0df9245c4b60197c78f72e510026b2c jdk8u60-b23 45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u52-b06 2b07cd3f89aab19a2f7f119f3d885b776342efcc jdk8u52-b07 45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u65-b00
--- a/THIRD_PARTY_README Mon Jul 06 12:23:46 2015 -0700 +++ b/THIRD_PARTY_README Thu Jul 09 22:43:14 2015 -0700 @@ -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
--- a/make/common/NativeCompilation.gmk Mon Jul 06 12:23:46 2015 -0700 +++ b/make/common/NativeCompilation.gmk Thu Jul 09 22:43:14 2015 -0700 @@ -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)