Mercurial > hg > release > icedtea7-forest-2.0
changeset 256:befdbb69155b
Merge
| author | lana |
|---|---|
| date | Sat, 25 Sep 2010 10:38:50 -0700 |
| parents | 27d945094f81 (current diff) b852103caf73 (diff) |
| children | db9fe730f305 |
| files | |
| diffstat | 4 files changed, 79 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Sep 24 14:04:01 2010 -0700 +++ b/.hgtags Sat Sep 25 10:38:50 2010 -0700 @@ -82,3 +82,7 @@ 9f96a4269d7727dad68864eaab795eafce270311 jdk7-b105 43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106 7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107 +140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108 +81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109 +2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110 +9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111
--- a/README-builds.html Fri Sep 24 14:04:01 2010 -0700 +++ b/README-builds.html Sat Sep 25 10:38:50 2010 -0700 @@ -148,7 +148,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 12</td> + <td>Sun Studio 12 Update 1 + patches</td> <td>JDK 6u14 FCS </td> </tr> <tr> @@ -158,7 +158,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 12</td> + <td>Sun Studio 12 Update 1 + patches</td> <td>JDK 6u14 FCS </td> </tr> <tr> @@ -168,7 +168,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 12</td> + <td>Sun Studio 12 Update 1 + patches</td> <td>JDK 6u14 FCS </td> </tr> <tr> @@ -178,7 +178,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 12</td> + <td>Sun Studio 12 Update 1 + patches</td> <td>JDK 6u14 FCS </td> </tr> <tr> @@ -941,21 +941,78 @@ <strong><a name="studio">Solaris: Sun Studio</a></strong> <blockquote> At a minimum, the - <a href="http://developers.sun.com/sunstudio/index.jsp" target="_blank"> - Sun Studio 12 Compilers</a> - (containing version 5.9 of the C and C++ compilers) is required, - with patches from the - <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/patch-access" target="_blank"> - SunSolve web site</a>. + <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.htm" target="_blank"> + Sun Studio 12 Update 1 Compilers</a> + (containing version 5.10 of the C and C++ compilers) is required, + including specific patches. + <p> + The Solaris SPARC patch list is: + <ul> + <li> + 118683-05: SunOS 5.10: Patch for profiling libraries and assembler + </li> + <li> + 119963-21: SunOS 5.10: Shared library patch for C++ + </li> + <li> + 120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch + </li> + <li> + 128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler + </li> + <li> + 141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 + </li> + <li> + 141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler + </li> + <li> + 142371-01: Sun Studio 12.1 Update 1: Patch for dbx + </li> + <li> + 143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling + </li> + <li> + 143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 + </li> + <li> + 142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools + </li> + </ul> + <p> + The Solaris X86 patch list is: + <ul> + <li> + 119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler + </li> + <li> + 119964-21: SunOS 5.10_x86: Shared library patch for C++_x86 + </li> + <li> + 120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch + </li> + <li> + 141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend + </li> + <li> + 128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler + </li> + <li> + 142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler + </li> + <li> + 142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools + </li> + </ul> <p> Set <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a> to point to the location of the compiler binaries, and place this location in the <tt>PATH</tt>. <p> - The Sun Studio Express compilers at: + The Oracle Solaris Studio Express compilers at: <a href="http://developers.sun.com/sunstudio/downloads/express.jsp" target="_blank"> - Sun Studio Express Download site</a> + Oracle Solaris Studio Express Download site</a> are also an option, although these compilers have not been extensively used yet. </blockquote>
--- a/make/templates/gpl-cp-header Fri Sep 24 14:04:01 2010 -0700 +++ b/make/templates/gpl-cp-header Sat Sep 25 10:38:50 2010 -0700 @@ -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.
--- a/make/templates/gpl-header Fri Sep 24 14:04:01 2010 -0700 +++ b/make/templates/gpl-header Sat Sep 25 10:38:50 2010 -0700 @@ -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.