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 --git a/make/jprt.properties b/make/jprt.properties index d3b71df624ab3f8a376105c09f7899a361c2b547..6a4541d0ab68c3f1715f94ec8c83a7bcfc7bba27 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -24,32 +24,12 @@ # # Properties for jprt -jprt.tools.default.release=jdk1.7.0 -# Specific platform list -jprt.build.platforms= \ - solaris_sparc_5.10, \ - solaris_sparcv9_5.10, \ - solaris_i586_5.10, \ - solaris_x64_5.10, \ - linux_i586_2.6, \ - linux_x64_2.6, \ - windows_i586_5.0, \ - windows_x64_5.2 +# Use whatever release that the submitted job requests +jprt.tools.default.release=${jprt.submit.release} -# The different build flavors we want +# The different build flavors we want, we override here so we just get these 2 jprt.build.flavors=product,fastdebug -jprt.run.flavors=c1,c2 -jprt.solaris_sparcv9.run.flavors=c2 -jprt.solaris_x64.run.flavors=c2 -jprt.windows_x64.run.flavors=c2 -jprt.linux_x64.run.flavors=c2 -jprt.run.flavor.c1.option=-client -jprt.run.flavor.c2.option=-server - -# Explicitly designate what the 32bit match is for the 64bit build -jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10 -jprt.solaris_x64.build.platform.match32=solaris_i586_5.10 # Shortened list of vm tests jprt.test.targets= \ @@ -89,6 +69,7 @@ jprt.make.rule.test.targets= \ # *-product-*-jdk_rmi # *-product-*-jdk_swing -# Directories to be excluded from source bundles +# Directories to be excluded from the source bundles jprt.bundle.exclude.src.dirs=build dist webrev + diff --git a/make/templates/gpl-cp-header b/make/templates/gpl-cp-header index 59473be222ae78dd11b253a95c59006f6894ff87..ed422f45fdc3fd72d193a4d0c87b517e61464131 100644 --- a/make/templates/gpl-cp-header +++ b/make/templates/gpl-cp-header @@ -17,6 +17,6 @@ You should have received a copy of the GNU General Public License version 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 --git a/make/templates/gpl-header b/make/templates/gpl-header index 07dbc05ecb7e9504a81c778969f5a6f0f600d884..e717b45b516a678eb2dfe85b52730942dba98536 100644 --- a/make/templates/gpl-header +++ b/make/templates/gpl-header @@ -15,6 +15,6 @@ You should have received a copy of the GNU General Public License version 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.+ 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.