At a minimum, the - - Sun Studio 12 Compilers - (containing version 5.9 of the C and C++ compilers) is required, - with patches from the - - SunSolve web site. + + Sun Studio 12 Update 1 Compilers + (containing version 5.10 of the C and C++ compilers) is required, + including specific patches. +diff -r a74f1fdb0bb8 -r 0047c4cd496b corba/.hgtags --- a/corba/.hgtags Wed Sep 15 13:41:14 2010 -0700 +++ b/corba/.hgtags Wed Jul 05 17:21:56 2017 +0200 @@ -83,3 +83,4 @@ 519daea48888196af76a975a3b31258efa860bad jdk7-b106 232adb83eae8375439ccff65b6e205ca0da0510d jdk7-b107 8d810527b499a67153365db74421a03c12b46f35 jdk7-b108 +c3dd858e09b20206459d9e7b0ead99d27ab00eab jdk7-b109 diff -r a74f1fdb0bb8 -r 0047c4cd496b hotspot/.hgtags --- a/hotspot/.hgtags Wed Sep 15 13:41:14 2010 -0700 +++ b/hotspot/.hgtags Wed Jul 05 17:21:56 2017 +0200 @@ -118,3 +118,4 @@ 0000000000000000000000000000000000000000 hs19-b06 6c43216df13513a0f96532aa06f213066c49e27b hs19-b06 e44a93947ccbfce712b51725f313163606f15486 jdk7-b108 +cc4bb3022b3144dc5db0805b9ef6c7eff2aa3b81 jdk7-b109 diff -r a74f1fdb0bb8 -r 0047c4cd496b jaxp/.hgtags --- a/jaxp/.hgtags Wed Sep 15 13:41:14 2010 -0700 +++ b/jaxp/.hgtags Wed Jul 05 17:21:56 2017 +0200 @@ -83,3 +83,4 @@ 5ba8469212a6cab95ca652eea414b753be7d245a jdk7-b106 20ee37c1372a3eaefa49b426c6eb68a2e8f5d6e2 jdk7-b107 7d379f8934caf255f53def1310c0ef0f1b512601 jdk7-b108 +0f382d6120fc07aed2209484a42458cabf405916 jdk7-b109 diff -r a74f1fdb0bb8 -r 0047c4cd496b jaxws/.hgtags --- a/jaxws/.hgtags Wed Sep 15 13:41:14 2010 -0700 +++ b/jaxws/.hgtags Wed Jul 05 17:21:56 2017 +0200 @@ -83,3 +83,4 @@ bc45ccc5bcca6cbe4ea433e279d4a93b06ab38c6 jdk7-b106 017612ea6af417a5e378619704da01bb3a583bdb jdk7-b107 b1ca39340238a239ba6d8489ad5315215e1366ca jdk7-b108 +4f626e0d70bda68c76bbd0e89d2bc2407f979736 jdk7-b109 diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/.hgtags --- a/jdk/.hgtags Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/.hgtags Wed Jul 05 17:21:56 2017 +0200 @@ -83,3 +83,4 @@ b91ef6b60f4e19bf4592c6dd594c9bac62487519 jdk7-b106 882103f334bb23745d3fd70fb7928c347478b0f4 jdk7-b107 17a5d84b75610255a3527e8ede1da19c91ba7a7e jdk7-b108 +ab0d3f54a63f2aadfcdd2e14b81f79362ce454e2 jdk7-b109 diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/make/common/shared/Compiler-sun.gmk --- a/jdk/make/common/shared/Compiler-sun.gmk Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/make/common/shared/Compiler-sun.gmk Wed Jul 05 17:21:56 2017 +0200 @@ -61,6 +61,7 @@ # Get compiler version _CC_VER :=$(shell $(CC) -V 2>&1 | $(HEAD) -n 1) CC_VER :=$(call GetVersion,"$(_CC_VER)") +CC_MINORVER :=$(call MinorVersion,$(CC_VER)) # Name of compilers being used COMPILER_VERSION-5.7 = SS10 @@ -69,8 +70,10 @@ COMPILER_NAME-5.8 = Sun Studio 11 COMPILER_VERSION-5.9 = SS12 COMPILER_NAME-5.9 = Sun Studio 12 -COMPILER_VERSION-5.10 = SS13 -COMPILER_NAME-5.10 = Sun Studio 13 +COMPILER_VERSION-5.10 = SS12u1 +COMPILER_NAME-5.10 = Sun Studio 12 Update 1 +COMPILER_VERSION-5.11 = OSS12u2 +COMPILER_NAME-5.11 = Oracle Solaris Studio 12 Update 2 COMPILER_VERSION = $(COMPILER_VERSION-$(CC_VER)) COMPILER_NAME = $(COMPILER_NAME-$(CC_VER)) @@ -112,8 +115,8 @@ XARCH_OPTION_OLD/64 += -xarch=amd64 LINT_XARCH_OPTION_OLD/64 += -Xarch=amd64 endif -# Pick the options we want based on the compiler being used. -ifeq ($(shell expr $(CC_VER) \>= 5.9), 1) +# Pick the options we want based on the compiler being used. (5.9 or newer) +ifeq ($(shell expr $(CC_MINORVER) \>= 9), 1) XARCH_OPTION/32 = $(XARCH_OPTION_NEW/32) XARCH_OPTION/64 = $(XARCH_OPTION_NEW/64) LINT_XARCH_OPTION/32 = $(LINT_XARCH_OPTION_NEW/32) diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/make/common/shared/Defs-versions.gmk --- a/jdk/make/common/shared/Defs-versions.gmk Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/make/common/shared/Defs-versions.gmk Wed Jul 05 17:21:56 2017 +0200 @@ -120,10 +120,10 @@ else REQUIRED_FREE_SPACE = 1040000 endif - REQUIRED_COMPILER_NAME = Sun Studio 12 - REQUIRED_COMPILER_VERSION = SS12 + REQUIRED_COMPILER_NAME = Sun Studio 12 Update 1 + REQUIRED_COMPILER_VERSION = SS12u1 ifeq ($(CC_VERSION),sun) - REQUIRED_CC_VER = 5.9 + REQUIRED_CC_VER = 5.10 endif ifeq ($(CC_VERSION),gcc) REQUIRED_CC_VER = 3.4.3 @@ -145,7 +145,7 @@ REQUIRED_CC_VER = 4.3.0 endif ifeq ($(CC_VERSION),sun) - REQUIRED_CC_VER = 5.9 + REQUIRED_CC_VER = 5.10 endif endif diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/make/java/redist/Makefile --- a/jdk/make/java/redist/Makefile Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/make/java/redist/Makefile Wed Jul 05 17:21:56 2017 +0200 @@ -43,6 +43,7 @@ CLIENT_LOCATION = client DB_SUFFIX = _db +DTRACE_SUFFIX = _dtrace ifeq ($(PLATFORM), windows) LIB_LOCATION = $(BINDIR) @@ -56,6 +57,7 @@ JVMPDB_NAME = $(LIB_PREFIX)jvm.pdb LIBJSIG_NAME = $(LIB_PREFIX)jsig.$(LIBRARY_SUFFIX) JVMDB_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX) +JVMDTRACE_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).$(LIBRARY_SUFFIX) CLASSSHARINGDATA_DIR = $(BUILDDIR)/tools/sharing @@ -161,6 +163,12 @@ ifeq ($(PLATFORM), solaris) IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME) +# The conditional can be removed when import JDKs contain these files. +ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME)),) + IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME) +else + $(warning WARNING: $(HOTSPOT_SERVER_PATH)/$(JVMDB_NAME) not found!) +endif endif ifneq ($(ZERO_BUILD), true) @@ -171,14 +179,29 @@ ifeq ($(PLATFORM), solaris) # solaris vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv solaris -ifeq ($(ARCH), sparc) - IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME) +IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME) + +# The conditional can be removed when import JDKs contain these files. +ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME)),) + IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME) + IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME) + IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME) +else + $(warning WARNING: $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME) not found!) endif -IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME) +# The conditional can be removed when import JDKs contain these files. +ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME)),) + IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME) +else + $(warning WARNING: $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME) not found!) +endif -ifeq ($(ARCH), sparc) - IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME) +# The conditional can be removed when import JDKs contain these files. +ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME)),) + IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME) +else + $(warning WARNING: $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME) not found!) endif # For backwards compatability, make a link of the 32-bit client JVM to $(LIBDIR) @@ -224,6 +247,18 @@ $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME) $(install-import-file) +$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME) + $(install-import-file) + +$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_NAME) + $(install-import-file) + +$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME) + $(install-import-file) + +$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME) + $(install-import-file) + $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_NAME) $(install-import-file) diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/make/templates/gpl-cp-header --- a/jdk/make/templates/gpl-cp-header Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/make/templates/gpl-cp-header Wed Jul 05 17:21:56 2017 +0200 @@ -17,6 +17,6 @@ 2 along with this work; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -CA 95054 USA or visit www.sun.com if you need additional information or -have any questions. +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +or visit www.oracle.com if you need additional information or have any +questions. diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/make/templates/gpl-header --- a/jdk/make/templates/gpl-header Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/make/templates/gpl-header Wed Jul 05 17:21:56 2017 +0200 @@ -15,6 +15,6 @@ 2 along with this work; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -CA 95054 USA or visit www.sun.com if you need additional information or -have any questions. +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +or visit www.oracle.com if you need additional information or have any +questions. diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/src/share/classes/java/lang/CharacterName.java --- a/jdk/src/share/classes/java/lang/CharacterName.java Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/src/share/classes/java/lang/CharacterName.java Wed Jul 05 17:21:56 2017 +0200 @@ -1,12 +1,12 @@ /* - * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2010, 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 * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. */ package java.lang; diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/src/share/classes/sun/font/GlyphDisposedListener.java --- a/jdk/src/share/classes/sun/font/GlyphDisposedListener.java Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/src/share/classes/sun/font/GlyphDisposedListener.java Wed Jul 05 17:21:56 2017 +0200 @@ -1,12 +1,12 @@ /* - * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2010, 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 * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. */ package sun.font; diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/src/share/classes/sun/jvmstat/monitor/Units.java --- a/jdk/src/share/classes/sun/jvmstat/monitor/Units.java Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/src/share/classes/sun/jvmstat/monitor/Units.java Wed Jul 05 17:21:56 2017 +0200 @@ -1,12 +1,12 @@ /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2004, 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 * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. */ package sun.jvmstat.monitor; diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/src/share/classes/sun/jvmstat/monitor/Variability.java --- a/jdk/src/share/classes/sun/jvmstat/monitor/Variability.java Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/src/share/classes/sun/jvmstat/monitor/Variability.java Wed Jul 05 17:21:56 2017 +0200 @@ -1,12 +1,12 @@ /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2004, 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 * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. */ package sun.jvmstat.monitor; diff -r a74f1fdb0bb8 -r 0047c4cd496b jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java --- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java Wed Sep 15 13:41:14 2010 -0700 +++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java Wed Jul 05 17:21:56 2017 +0200 @@ -447,7 +447,9 @@ String ls = System.getProperty("line.separator"); for(int i=0;i+ The Solaris SPARC patch list is: +
+
+- + 118683-05: SunOS 5.10: Patch for profiling libraries and assembler +
+- + 119963-21: SunOS 5.10: Shared library patch for C++ +
+- + 120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch +
+- + 128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler +
+- + 141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 +
+- + 141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler +
+- + 142371-01: Sun Studio 12.1 Update 1: Patch for dbx +
+- + 143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling +
+- + 143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 +
+- + 142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools +
++ The Solaris X86 patch list is: +
+
- + 119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler +
+- + 119964-21: SunOS 5.10_x86: Shared library patch for C++_x86 +
+- + 120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch +
+- + 141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend +
+- + 128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler +
+- + 142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler +
+- + 142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools +
+Set ALT_COMPILER_PATH to point to the location of the compiler binaries, and place this location in the PATH.
- The Sun Studio Express compilers at: + The Oracle Solaris Studio Express compilers at: - Sun Studio Express Download site + Oracle Solaris Studio Express Download site are also an option, although these compilers have not been extensively used yet.