mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-21 11:34:38 +02:00
Merge
This commit is contained in:
commit
0a8ed973da
4 changed files with 76 additions and 18 deletions
|
@ -83,3 +83,4 @@ f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104
|
||||||
43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106
|
43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106
|
||||||
7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107
|
7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107
|
||||||
140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
|
140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
|
||||||
|
81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
|
||||||
|
|
|
@ -148,7 +148,7 @@
|
||||||
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
|
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
|
||||||
SunSolve</a> for patch downloads.
|
SunSolve</a> for patch downloads.
|
||||||
</td>
|
</td>
|
||||||
<td>Sun Studio 12</td>
|
<td>Sun Studio 12 Update 1 + patches</td>
|
||||||
<td>JDK 6u14 FCS </td>
|
<td>JDK 6u14 FCS </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -158,7 +158,7 @@
|
||||||
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
|
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
|
||||||
SunSolve</a> for patch downloads.
|
SunSolve</a> for patch downloads.
|
||||||
</td>
|
</td>
|
||||||
<td>Sun Studio 12</td>
|
<td>Sun Studio 12 Update 1 + patches</td>
|
||||||
<td>JDK 6u14 FCS </td>
|
<td>JDK 6u14 FCS </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -168,7 +168,7 @@
|
||||||
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
|
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
|
||||||
SunSolve</a> for patch downloads.
|
SunSolve</a> for patch downloads.
|
||||||
</td>
|
</td>
|
||||||
<td>Sun Studio 12</td>
|
<td>Sun Studio 12 Update 1 + patches</td>
|
||||||
<td>JDK 6u14 FCS </td>
|
<td>JDK 6u14 FCS </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -178,7 +178,7 @@
|
||||||
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
|
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
|
||||||
SunSolve</a> for patch downloads.
|
SunSolve</a> for patch downloads.
|
||||||
</td>
|
</td>
|
||||||
<td>Sun Studio 12</td>
|
<td>Sun Studio 12 Update 1 + patches</td>
|
||||||
<td>JDK 6u14 FCS </td>
|
<td>JDK 6u14 FCS </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -941,21 +941,78 @@
|
||||||
<strong><a name="studio">Solaris: Sun Studio</a></strong>
|
<strong><a name="studio">Solaris: Sun Studio</a></strong>
|
||||||
<blockquote>
|
<blockquote>
|
||||||
At a minimum, the
|
At a minimum, the
|
||||||
<a href="http://developers.sun.com/sunstudio/index.jsp" target="_blank">
|
<a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.htm" target="_blank">
|
||||||
Sun Studio 12 Compilers</a>
|
Sun Studio 12 Update 1 Compilers</a>
|
||||||
(containing version 5.9 of the C and C++ compilers) is required,
|
(containing version 5.10 of the C and C++ compilers) is required,
|
||||||
with patches from the
|
including specific patches.
|
||||||
<a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/patch-access" target="_blank">
|
<p>
|
||||||
SunSolve web site</a>.
|
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>
|
<p>
|
||||||
Set
|
Set
|
||||||
<a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>
|
<a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>
|
||||||
to point to the location of
|
to point to the location of
|
||||||
the compiler binaries, and place this location in the <tt>PATH</tt>.
|
the compiler binaries, and place this location in the <tt>PATH</tt>.
|
||||||
<p>
|
<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">
|
<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
|
are also an option, although these compilers have not
|
||||||
been extensively used yet.
|
been extensively used yet.
|
||||||
</blockquote>
|
</blockquote>
|
||||||
|
|
|
@ -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,
|
2 along with this work; if not, write to the Free Software Foundation,
|
||||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
CA 95054 USA or visit www.sun.com if you need additional information or
|
or visit www.oracle.com if you need additional information or have any
|
||||||
have any questions.
|
questions.
|
||||||
|
|
|
@ -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,
|
2 along with this work; if not, write to the Free Software Foundation,
|
||||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
CA 95054 USA or visit www.sun.com if you need additional information or
|
or visit www.oracle.com if you need additional information or have any
|
||||||
have any questions.
|
questions.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue