Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Fri, 17 Sep 2010 07:08:23 -0400
- author
- herrick
- date
- Fri, 17 Sep 2010 07:08:23 -0400
- changeset 231
- 85736b9f2026
- parent 230
- 1fa39984ba8c
- parent 214
- 2a02d4a6955c
- child 232
- d4a7e4600b21
Merge
1.1 --- a/.hgtags Fri Sep 03 20:19:45 2010 -0700 1.2 +++ b/.hgtags Fri Sep 17 07:08:23 2010 -0400 1.3 @@ -83,3 +83,4 @@ 1.4 43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106 1.5 7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107 1.6 140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108 1.7 +81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
2.1 --- a/README-builds.html Fri Sep 03 20:19:45 2010 -0700 2.2 +++ b/README-builds.html Fri Sep 17 07:08:23 2010 -0400 2.3 @@ -148,7 +148,7 @@ 2.4 See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> 2.5 SunSolve</a> for patch downloads. 2.6 </td> 2.7 - <td>Sun Studio 12</td> 2.8 + <td>Sun Studio 12 Update 1 + patches</td> 2.9 <td>JDK 6u14 FCS </td> 2.10 </tr> 2.11 <tr> 2.12 @@ -158,7 +158,7 @@ 2.13 See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> 2.14 SunSolve</a> for patch downloads. 2.15 </td> 2.16 - <td>Sun Studio 12</td> 2.17 + <td>Sun Studio 12 Update 1 + patches</td> 2.18 <td>JDK 6u14 FCS </td> 2.19 </tr> 2.20 <tr> 2.21 @@ -168,7 +168,7 @@ 2.22 See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> 2.23 SunSolve</a> for patch downloads. 2.24 </td> 2.25 - <td>Sun Studio 12</td> 2.26 + <td>Sun Studio 12 Update 1 + patches</td> 2.27 <td>JDK 6u14 FCS </td> 2.28 </tr> 2.29 <tr> 2.30 @@ -178,7 +178,7 @@ 2.31 See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> 2.32 SunSolve</a> for patch downloads. 2.33 </td> 2.34 - <td>Sun Studio 12</td> 2.35 + <td>Sun Studio 12 Update 1 + patches</td> 2.36 <td>JDK 6u14 FCS </td> 2.37 </tr> 2.38 <tr> 2.39 @@ -941,21 +941,78 @@ 2.40 <strong><a name="studio">Solaris: Sun Studio</a></strong> 2.41 <blockquote> 2.42 At a minimum, the 2.43 - <a href="http://developers.sun.com/sunstudio/index.jsp" target="_blank"> 2.44 - Sun Studio 12 Compilers</a> 2.45 - (containing version 5.9 of the C and C++ compilers) is required, 2.46 - with patches from the 2.47 - <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/patch-access" target="_blank"> 2.48 - SunSolve web site</a>. 2.49 + <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.htm" target="_blank"> 2.50 + Sun Studio 12 Update 1 Compilers</a> 2.51 + (containing version 5.10 of the C and C++ compilers) is required, 2.52 + including specific patches. 2.53 + <p> 2.54 + The Solaris SPARC patch list is: 2.55 + <ul> 2.56 + <li> 2.57 + 118683-05: SunOS 5.10: Patch for profiling libraries and assembler 2.58 + </li> 2.59 + <li> 2.60 + 119963-21: SunOS 5.10: Shared library patch for C++ 2.61 + </li> 2.62 + <li> 2.63 + 120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch 2.64 + </li> 2.65 + <li> 2.66 + 128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler 2.67 + </li> 2.68 + <li> 2.69 + 141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 2.70 + </li> 2.71 + <li> 2.72 + 141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler 2.73 + </li> 2.74 + <li> 2.75 + 142371-01: Sun Studio 12.1 Update 1: Patch for dbx 2.76 + </li> 2.77 + <li> 2.78 + 143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling 2.79 + </li> 2.80 + <li> 2.81 + 143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 2.82 + </li> 2.83 + <li> 2.84 + 142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools 2.85 + </li> 2.86 + </ul> 2.87 + <p> 2.88 + The Solaris X86 patch list is: 2.89 + <ul> 2.90 + <li> 2.91 + 119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler 2.92 + </li> 2.93 + <li> 2.94 + 119964-21: SunOS 5.10_x86: Shared library patch for C++_x86 2.95 + </li> 2.96 + <li> 2.97 + 120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch 2.98 + </li> 2.99 + <li> 2.100 + 141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend 2.101 + </li> 2.102 + <li> 2.103 + 128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler 2.104 + </li> 2.105 + <li> 2.106 + 142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler 2.107 + </li> 2.108 + <li> 2.109 + 142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools 2.110 + </li> 2.111 + </ul> 2.112 <p> 2.113 Set 2.114 <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a> 2.115 to point to the location of 2.116 the compiler binaries, and place this location in the <tt>PATH</tt>. 2.117 <p> 2.118 - The Sun Studio Express compilers at: 2.119 + The Oracle Solaris Studio Express compilers at: 2.120 <a href="http://developers.sun.com/sunstudio/downloads/express.jsp" target="_blank"> 2.121 - Sun Studio Express Download site</a> 2.122 + Oracle Solaris Studio Express Download site</a> 2.123 are also an option, although these compilers have not 2.124 been extensively used yet. 2.125 </blockquote>
3.1 --- a/make/jprt.properties Fri Sep 03 20:19:45 2010 -0700 3.2 +++ b/make/jprt.properties Fri Sep 17 07:08:23 2010 -0400 3.3 @@ -24,32 +24,12 @@ 3.4 # 3.5 3.6 # Properties for jprt 3.7 -jprt.tools.default.release=jdk1.7.0 3.8 3.9 -# Specific platform list 3.10 -jprt.build.platforms= \ 3.11 - solaris_sparc_5.10, \ 3.12 - solaris_sparcv9_5.10, \ 3.13 - solaris_i586_5.10, \ 3.14 - solaris_x64_5.10, \ 3.15 - linux_i586_2.6, \ 3.16 - linux_x64_2.6, \ 3.17 - windows_i586_5.0, \ 3.18 - windows_x64_5.2 3.19 +# Use whatever release that the submitted job requests 3.20 +jprt.tools.default.release=${jprt.submit.release} 3.21 3.22 -# The different build flavors we want 3.23 +# The different build flavors we want, we override here so we just get these 2 3.24 jprt.build.flavors=product,fastdebug 3.25 -jprt.run.flavors=c1,c2 3.26 -jprt.solaris_sparcv9.run.flavors=c2 3.27 -jprt.solaris_x64.run.flavors=c2 3.28 -jprt.windows_x64.run.flavors=c2 3.29 -jprt.linux_x64.run.flavors=c2 3.30 -jprt.run.flavor.c1.option=-client 3.31 -jprt.run.flavor.c2.option=-server 3.32 - 3.33 -# Explicitly designate what the 32bit match is for the 64bit build 3.34 -jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10 3.35 -jprt.solaris_x64.build.platform.match32=solaris_i586_5.10 3.36 3.37 # Shortened list of vm tests 3.38 jprt.test.targets= \ 3.39 @@ -89,6 +69,7 @@ 3.40 # *-product-*-jdk_rmi 3.41 # *-product-*-jdk_swing 3.42 3.43 -# Directories to be excluded from source bundles 3.44 +# Directories to be excluded from the source bundles 3.45 jprt.bundle.exclude.src.dirs=build dist webrev 3.46 3.47 +
4.1 --- a/make/templates/gpl-cp-header Fri Sep 03 20:19:45 2010 -0700 4.2 +++ b/make/templates/gpl-cp-header Fri Sep 17 07:08:23 2010 -0400 4.3 @@ -17,6 +17,6 @@ 4.4 2 along with this work; if not, write to the Free Software Foundation, 4.5 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 4.6 4.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 4.8 -CA 95054 USA or visit www.sun.com if you need additional information or 4.9 -have any questions. 4.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 4.11 +or visit www.oracle.com if you need additional information or have any 4.12 +questions.
5.1 --- a/make/templates/gpl-header Fri Sep 03 20:19:45 2010 -0700 5.2 +++ b/make/templates/gpl-header Fri Sep 17 07:08:23 2010 -0400 5.3 @@ -15,6 +15,6 @@ 5.4 2 along with this work; if not, write to the Free Software Foundation, 5.5 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 5.6 5.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 5.8 -CA 95054 USA or visit www.sun.com if you need additional information or 5.9 -have any questions. 5.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 5.11 +or visit www.oracle.com if you need additional information or have any 5.12 +questions.
