diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 83467a0233c..deea0c42bc7 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -83,3 +83,4 @@ f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104 43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106 7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107 140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108 +81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109 diff --git a/README-builds.html b/README-builds.html index 00b8612911d..81ada58e303 100644 --- a/README-builds.html +++ b/README-builds.html @@ -148,7 +148,7 @@ See SunSolve for patch downloads. - Sun Studio 12 + Sun Studio 12 Update 1 + patches JDK 6u14 FCS @@ -158,7 +158,7 @@ See SunSolve for patch downloads. - Sun Studio 12 + Sun Studio 12 Update 1 + patches JDK 6u14 FCS @@ -168,7 +168,7 @@ See SunSolve for patch downloads. - Sun Studio 12 + Sun Studio 12 Update 1 + patches JDK 6u14 FCS @@ -178,7 +178,7 @@ See SunSolve for patch downloads. - Sun Studio 12 + Sun Studio 12 Update 1 + patches JDK 6u14 FCS @@ -941,21 +941,78 @@ Solaris: Sun Studio
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. +

+ The Solaris SPARC patch list is: +

+

+ The Solaris X86 patch list is: +

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.

diff --git a/make/templates/gpl-cp-header b/make/templates/gpl-cp-header index 59473be222a..ed422f45fdc 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 07dbc05ecb7..e717b45b516 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.