Mercurial > hg > icedtea8-forest
changeset 2124:9a7fbbe2d7ed icedtea-3.7.0pre01
Merge jdk8u152-b16
| author | andrew |
|---|---|
| date | Thu, 07 Dec 2017 02:46:45 +0000 |
| parents | 52a299828e97 (current diff) 7a25d12cd94f (diff) |
| children | 1030d6d2a14d |
| files | .hgtags common/autoconf/generated-configure.sh common/autoconf/hotspot-spec.gmk.in common/autoconf/spec.gmk.in common/autoconf/toolchain.m4 make/common/NativeCompilation.gmk |
| diffstat | 5 files changed, 46 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Nov 02 06:16:11 2017 +0000 +++ b/.hgtags Thu Dec 07 02:46:45 2017 +0000 @@ -758,3 +758,30 @@ af89399e4d1190c42e23b95da79800da51b40808 jdk8u151-b10 ace131d990fdb75a6616f18265b2c4ecca2e3f5d jdk8u151-b11 eb577ed6ec931d15540c6a71192a6a55f8366569 icedtea-3.6.0 +27cf3b1673624b3b9e246e526ba7848fa5f98400 jdk8u151-b12 +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 +8f1aee9f3d074e074b74fdd4c63d21c554295443 jdk8u152-b08 +88df79df1243571bbce3a8d4935ff7f25b9ade78 jdk8u152-b09 +336862c1e889840a37fe3b07eae2cd328382782d jdk8u152-b10 +075ea12bcfd50b6567f8fce95bfaec952dcdbda7 jdk8u152-b11 +b6d513f3cde1d8a7b81f769926e3d55b514696b2 jdk8u152-b12 +ec86194825dd0c2fc3d6ee88b287650e1c8e24c9 jdk8u152-b13 +c425fe56b8fb34e21a798be796305f51d648f11b jdk8u152-b14 +d680e12deacbc531fe647d356540384efe625223 jdk8u152-b15
--- a/ASSEMBLY_EXCEPTION Thu Nov 02 06:16:11 2017 +0000 +++ b/ASSEMBLY_EXCEPTION Thu Dec 07 02:46:45 2017 +0000 @@ -1,27 +1,27 @@ OPENJDK ASSEMBLY EXCEPTION -The OpenJDK source code made available by Sun at openjdk.java.net and -openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the -GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 +The OpenJDK source code made available by Oracle America, Inc. (Oracle) at +openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU +General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 only ("GPL2"), with the following clarification and special exception. Linking this OpenJDK Code statically or dynamically with other code is making a combined work based on this library. Thus, the terms and conditions of GPL2 cover the whole combination. - As a special exception, Sun gives you permission to link this - OpenJDK Code with certain code licensed by Sun as indicated at + As a special exception, Oracle gives you permission to link this + OpenJDK Code with certain code licensed by Oracle as indicated at http://openjdk.java.net/legal/exception-modules-2007-05-08.html ("Designated Exception Modules") to produce an executable, regardless of the license terms of the Designated Exception Modules, and to copy and distribute the resulting executable under GPL2, provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Sun. + governed by the licenses under which they were offered by Oracle. -As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to -build an executable that includes those portions of necessary code that Sun -could not provide under GPL2 (or that Sun has provided under GPL2 with the -Classpath exception). If you modify or add to the OpenJDK code, that new -GPL2 code may still be combined with Designated Exception Modules if the -new code is made subject to this exception by its copyright holder. +As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code +to build an executable that includes those portions of necessary code that +Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 +with the Classpath exception). If you modify or add to the OpenJDK code, +that new GPL2 code may still be combined with Designated Exception Modules +if the new code is made subject to this exception by its copyright holder.
--- a/common/autoconf/generated-configure.sh Thu Nov 02 06:16:11 2017 +0000 +++ b/common/autoconf/generated-configure.sh Thu Dec 07 02:46:45 2017 +0000 @@ -3999,7 +3999,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1500922661 +DATE_WHEN_GENERATED=1512591341 ############################################################################### # @@ -20101,7 +20101,6 @@ fi fi - COMPILER=$CC COMPILER_NAME=$COMPILER_NAME @@ -21283,7 +21282,6 @@ fi fi - COMPILER=$CXX COMPILER_NAME=$COMPILER_NAME
--- a/common/autoconf/toolchain.m4 Thu Nov 02 06:16:11 2017 +0000 +++ b/common/autoconf/toolchain.m4 Thu Dec 07 02:46:45 2017 +0000 @@ -222,7 +222,6 @@ AC_MSG_ERROR([$TEST_COMPILER is a symbolic link to ccache. This is not supported.]) fi fi - TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME]) ])
--- a/make/common/NativeCompilation.gmk Thu Nov 02 06:16:11 2017 +0000 +++ b/make/common/NativeCompilation.gmk Thu Dec 07 02:46:45 2017 +0000 @@ -297,17 +297,21 @@ $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS)) endif - # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS. - $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) + # Pickup extra OPENJDK_TARGET_OS_API, OPENJDK_TARGET_OS, and/or OPENJDK_TARGET_OS plus + # OPENJDK_TARGET_CPU pair dependent variables for CFLAGS. + $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) \ + $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)) ifneq ($(DEBUG_LEVEL),release) # Pickup extra debug dependent variables for CFLAGS $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug) + $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_debug) else $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release) + $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release) endif # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.