changeset 462:a418b563ed63

Merge
author ohair
date Wed, 06 Aug 2008 16:43:53 -0700
parents e35680499077 a140a5aa5f2c
children 32a4e56d5f68
files make/README-builds.html make/README.html make/common/Defs-linux.gmk make/common/Defs-solaris.gmk make/common/Defs-windows.gmk make/common/Defs.gmk make/common/shared/Defs.gmk make/java/fdlibm/Makefile make/java/java_hprof_demo/Makefile make/sun/font/Makefile make/sun/font/t2k/Makefile make/sun/jpeg/Makefile
diffstat 18 files changed, 246 insertions(+), 1709 deletions(-) [+]
line wrap: on
line diff
--- a/make/README-builds.html	Wed Aug 06 15:02:15 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1452 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head><title>OpenJDK Build README</title></head>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<center>
-    <h1>OpenJDK Build README</h1>
-</center>
-
-<!-- ------------------------------------------------------ --> 
-<hr noshade="noshade" size="3">
-
-<h2><a name="introduction">Introduction</a></h2>
-
-<blockquote>
-    <p>
-    This README file contains build instructions for the 
-    <a href="http://openjdk.java.net">OpenJDK</a>.
-    Building the source code for the 
-    OpenJDK
-    requires
-    a certain degree of technical expertise.
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h2><a name="contents">Contents</a></h2>
-
-<blockquote>
-    <ul>
-        <li><a href="#introduction">Introduction</a></li>
-        <li><a href="#MBE">Minimum Build Environments</a></li>
-        <li><a href="#SDBE">Specific Developer Build Environments</a></li>
-        <li><a href="#directories">Source Directory Structure</a> </li>
-        <li><a href="#building">Build Information</a>
-            <ul type="disc">
-                <li><a href="#gmake">GNU Make (<tt><i>gmake</i></tt>)</a> </li>
-                <li><a href="#linux">Basic Linux System Setup</a> </li>
-                <li><a href="#solaris">Basic Solaris System Setup</a> </li>
-                <li><a href="#windows">Basic Windows System Setup</a> </li>
-                <li><a href="#dependencies">Build Dependencies</a> </li>
-                <ul type="disc">
-                    <li><a href="#bootjdk">Bootstrap JDK</a> </li>
-                    <li><a href="#binaryplugs">Binary Plugs</a> </li>
-                    <li><a href="#cacerts">Certificate Authority File (cacert)</a> </li>
-                    <li><a href="#compilers">Compilers</a> 
-                        <ul>
-                            <li><a href="#msvc">Microsoft Visual Studio</a> </li>
-                            <li><a href="#mssdk">Microsoft Platform SDK</a> </li>
-                            <li><a href="#gcc">Linux gcc/binutils</a> </li>
-                            <li><a href="#studio">Sun Studio</a> </li>
-                        </ul>
-                    </li>
-                    <li>Linux and Solaris:
-                        <ul>
-                            <li><a href="#cups">CUPS Include files</a> </li>
-                        </ul>
-                    </li>
-                    <li>Windows only:
-                        <ul>
-                            <li>Unix Command Tools (<a href="#cygwin">CYGWIN</a>)</li>
-                            <li><a href="#dxsdk">DirectX 9.0 SDK</a> </li>
-                        </ul>
-                    </li>
-                </ul>
-            </ul>
-        </li>
-        <li><a href="#creating">Creating the Build</a> </li>
-        <li><a href="#testing">Testing the Build</a> </li>
-        <li><a href="#variables">Environment/Make Variables</a></li>
-        <li><a href="#troubleshooting">Troubleshooting</a></li>
-    </ul>
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h2><a name="MBE">Minimum Build Environments</a></h2>
-
-<blockquote>
-    <p>
-    This file often describes specific requirements for what we call the
-    "minimum build environments" (MBE) for the JDK.
-    Building with the MBE will generate the most compatible
-    bits that install on, and run correctly on, the most variations
-    of the same base OS and hardware architecture.
-    These usually represent what is often called the
-    least common denominator platforms.
-    It is understood that most developers will NOT be using these 
-    specific platforms, and in fact creating these specific platforms
-    may be difficult due to the age of some of this software.
-    <p>
-    
-    <p>
-    The minimum OS and C/C++ compiler versions needed for building the
-    OpenJDK:
-    <p>
-    <center>
-        <table border="1">
-            <thead>
-                <tr>
-                    <th>Base OS and Architecture</th>
-                    <th>OS</th>
-                    <th>Compiler</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td>Linux X86 (32bit)</td>
-                    <td>Red Hat Enterprise Linux 4 </td>
-                    <td>gcc 4 </td>
-                </tr>
-                <tr>
-                    <td>Linux X64 (64bit)</td>
-                    <td>Red Hat Enterprise Linux 4 </td>
-                    <td>gcc 4 </td>
-                </tr>
-                <tr>
-                    <td>Solaris SPARC (32bit)</td>
-                    <td>Solaris 10 + patches 
-                        <br>
-                        See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE">SunSolve</a> for patch downloads.
-                    </td>
-                    <td>Sun Studio 11 </td>
-                </tr>
-                <tr>
-                    <td>Solaris SPARCV9 (64bit)</td>
-                    <td>Solaris 10 + patches
-                        <br>
-                        See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE">SunSolve</a> for patch downloads.
-                    </td>
-                    <td>Sun Studio 11</td>
-                </tr>
-                <tr>
-                    <td>Solaris X86 (32bit)</td>
-                    <td>Solaris 10 + patches
-                        <br>
-                        See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE">SunSolve</a> for patch downloads.
-                    </td>
-                    <td>Sun Studio 11</td>
-                </tr>
-                <tr>
-                    <td>Solaris X64 (64bit)</td>
-                    <td>Solaris 10 + patches
-                        <br>
-                        See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE">SunSolve</a> for patch downloads.
-                    </td>
-                    <td>Sun Studio 11</td>
-                </tr>
-                <tr>
-                    <td>Windows X86 (32bit)</td>
-                    <td>Windows XP</td>
-                    <td>Microsoft Visual Studio .NET 2003 Professional</td>
-                </tr>
-                <tr>
-                    <td>Windows X64 (64bit)</td>
-                    <td>Windows Server 2003 - Enterprise x64 Edition</td>
-                    <td>Microsoft Platform SDK - April 2005</td>
-                </tr>
-            </tbody>
-        </table>
-    </center>
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h2><a name="SDBE">Specific Developer Build Environments</a></h2>
-
-<blockquote>
-    <p>
-    We won't be listing all the possible environments, but
-    we will try to provide what information we have available to us.
-</blockquote>
-
-<h3><a name="fedora">Fedora</a></h3>
-
-<blockquote>
-    TBD
-</blockquote>
-
-<h3><a name="debian">Debian</a></h3>
-
-<blockquote>
-    TBD
-</blockquote>
-
-<h3><a name="ubuntu">Ubuntu</a></h3>
-
-<blockquote>
-    <p>
-    In addition to needing the Bootstrap JDK and the Binary Plugs, 
-    when building on Ubuntu you will need to
-    make sure certain packages are installed.
-    In particular, certain X11 packages, make, m4, gawk, gcc 4, 
-    binutils, cups, freetype
-    and alsa.
-    
-    <h4>Ubuntu 6.06</h4>
-    
-    <p>
-    The following list of packages for Ubuntu 6.06 is a working set that
-    does appear to work. 
-    
-    <p>
-    <b>Note that it's quite possible that some of these
-        packages are not required, so anyone discovering that some of the
-        packages listed below are NOT required,
-        please let the
-        OpenJDK
-    team know.</b>
-    <p>
-    All the packages below can be installed with the
-    Synaptic Package manager provided with the base Ubuntu 6.06 release.
-    
-    <blockquote>
-        <ul>
-            <li>binutils (2.16.1cvs20060117-1ubuntu2.1)</li>
-            <li>cpp (4:4.0.3-1)</li>
-            <li>cpp-4.0 (4.0.3-1ubuntu5)</li>
-            <li>libfreetype6-dev</li>
-            <li>g++ (4:4.0.3-1)</li>
-            <li>g++-4.0 (4.0.3-1ubuntu5)</li>
-            <li>gawk (1:3.1.5-2build1)</li>
-            <li>gcc (4:4.0.3-1)</li>
-            <li>gcc-4.0 (4.0.3-1ubuntu5)</li>
-            <li>libasound2-dev (1.0.10-2ubuntu4)</li>
-            <li>libc6 (2.3.6-0ubuntu20) to 2.3.6-0ubuntu20.4</li>
-            <li>libc6-dev (2.3.6-0ubuntu20.4)</li>
-            <li>libc6-i686 (2.3.6-0ubuntu20) to 2.3.6-0ubuntu20.4</li>
-            <li>libcupsys2-dev (1.2.2-0ubuntu0.6.06)</li>
-            <li>libgcrypt11-dev (1.2.2-1)</li>
-            <li>libgnutls-dev (1.2.9-2ubuntu1.1)</li>
-            <li>libgnutls12 (1.2.9-2ubuntu1) to 1.2.9-2ubuntu1.1</li>
-            <li>libgpg-error-dev (1.1-4)</li>
-            <li>libice-dev (2:1.0.0-0ubuntu2)</li>
-            <li>liblockfile1 (1.06.1)</li>
-            <li>libopencdk8-dev (0.5.7-2)</li>
-            <li>libpopt-dev (1.7-5)</li>
-            <li>libsm-dev (2:1.0.0-0ubuntu2)</li>
-            <li>libstdc++6-4.0-dev (4.0.3-1ubuntu5)</li>
-            <li>libtasn1-2-dev (0.2.17-1ubuntu1)</li>
-            <li>libx11-dev (2:1.0.0-0ubuntu9)</li>
-            <li>libxau-dev (1:1.0.0-0ubuntu4)</li>
-            <li>libxaw-headers (2:1.0.1-0ubuntu3)</li>
-            <li>libxaw7-dev (2:1.0.1-0ubuntu3)</li>
-            <li>libxdmcp-dev (1:1.0.0-0ubuntu2)</li>
-            <li>libxext-dev (2:1.0.0-0ubuntu4)</li>
-            <li>libxi-dev (2:1.0.0-0ubuntu3) </li>
-            <li>libxmu-dev (2:1.0.0-0ubuntu3)</li>
-            <li>libxmu-headers (2:1.0.0-0ubuntu3)</li>
-            <li>libxmuu-dev (2:1.0.0-0ubuntu3)</li>
-            <li>libxp-dev (6.8.2-11ubuntu2)</li>
-            <li>libxpm-dev (1:3.5.4.2-0ubuntu3)</li>
-            <li>libxrandr-dev (1:1.1.0.2-0ubuntu4)</li>
-            <li>libxt-dev (1:1.0.0-0ubuntu3)</li>
-            <li>libxtrap-dev (2:1.0.0-0ubuntu2)</li>
-            <li>libxtst-dev (2:1.0.1-0ubuntu2)</li>
-            <li>libxv-dev (2:1.0.1-0ubuntu3)</li>
-            <li>linux-kernel-headers (2.6.11.2-0ubuntu18)</li>
-            <li>m4 (1.4.4-1)</li>
-            <li>make (3.80+3.81.b4-1)</li>
-            <li>ssl-cert (1.0.13)</li>
-            <li>x-dev (7.0.4-0ubuntu2)</li>
-            <li>x11proto-core-dev (7.0.4-0ubuntu2)</li>
-            <li>x11proto-input-dev (1.3.2-0ubuntu2)</li>
-            <li>x11proto-kb-dev (1.0.2-0ubuntu2)</li>
-            <li>x11proto-randr-dev (1.1.2-0ubuntu2)</li>
-            <li>x11proto-record-dev (1.13.2-0ubuntu2)</li>
-            <li>x11proto-trap-dev (3.4.3-0ubuntu2)</li>
-            <li>x11proto-video-dev (2.2.2-0ubuntu2)</li>
-            <li>x11proto-xext-dev (7.0.2-0ubuntu2)</li>
-            <li>xlibs-dev (7.0.0-0ubuntu45)</li>
-            <li>zlib1g-dev (1:1.2.3-6ubuntu4)</li>
-        </ul>
-    </blockquote>
-    
-    <h4>Ubuntu 7.04</h4>
-    
-    <p>
-    Using the Synaptic Package Manager, download the following
-    packages (double indented packages are automatically aquired
-    due to package dependencies):
-    
-    <blockquote>
-        <ul>
-            <li>build-essential</li>
-            <ul>
-                <li>dpkg-dev</li>
-                <li>g++</li>
-                <li>g++-4.1</li>
-                <li>libc6-dev</li>
-                <li>libstdc++6.4.1-dev</li>
-                <li>linux-libc-dev</li>
-            </ul>
-            <li>gawk</li>
-            <li>m4</li>
-            <li>libasound2-dev</li>
-            <li>libcupsys2-dev</li>
-            <ul>
-                <li>libgcrypt11-dev</li>
-                <li>lgnutls-dev</li>
-                <li>libgpg-error-dev</li>
-                <li>liblzo-dev</li>
-                <li>libopencdk8-dev</li>
-                <li>libpopt-dev</li>
-                <li>libtasn1-3-dev</li>
-                <li>zlib1g-dev</li>
-            </ul>
-            <li>sun-java6-jdk</li>
-            <ul>
-                <li>java-common</li>
-                <li>libltdl3</li>
-                <li>odbcinst1debian1</li>
-                <li>sun-java6-bin</li>
-                <li>sun-java6-jre</li>
-                <li>unixodbc</li>
-            </ul>
-            <li>xlibs-dev</li>
-            <ul>
-                <li>(many)</li>
-            </ul>
-            <li>x11proto-print-dev</li>
-            <li>libxaw7-dev</li>
-            <ul>
-                <li>libxaw-headers</li>
-            </ul>
-            <li>libxp-dev</li>
-            <li>libfreetype6-dev</li>
-        </ul>
-    </blockquote>
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h2><a name="directories">Source Directory Structure</a></h2>
-
-<blockquote>
-    <p>
-    The source code for the 
-    OpenJDK is
-    delivered in <i>3</i> sibling directories:
-    <tt>hotspot</tt>, 
-    <tt>langtools</tt>, 
-    <tt>corba</tt>, 
-    <tt>jaxws</tt>, 
-    <tt>jaxp</tt>, 
-    <tt>jdk</tt>
-    and
-    The <tt>hotspot</tt> directory contains the source code and make
-    files for
-    building the 
-    OpenJDK
-    Hotspot Virtual Machine. 
-    The <tt>jdk</tt>
-    directory contains the source code and make files for
-    building the 
-    OpenJDK
-    runtime libraries, tools and demos. 
-    The top level Makefile is used to build the complete OpenJDK 
-    release including building the hotspot
-    VM, staging the VM binaries, and building the 
-    OpenJDK 
-    runtime libraries,
-    tools and demos.
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h2><a name="building">Build Information</a></h2>
-
-<blockquote>
-    <p>
-    Building the 
-    OpenJDK
-    is done with a <tt><i>gmake</i></tt>
-    command line and various
-    environment or make variable settings that direct the make rules
-    to where various components have been installed.
-    Where possible the makefiles will attempt to located the various
-    components in the default locations or any component specific 
-    variable settings.
-    When the normal defaults fail or components cannot be found,
-    the various
-    <tt>ALT_*</tt> variables (alternates)
-    can be used to help the makefiles locate components.
-    <p>
-    Refer to the bash/sh/ksh setup file
-    <tt>jdk/make/jdk_generic_profile.sh</tt>
-    if you need help in setting up your environment variables.
-    A build could be as simple as:
-    <blockquote>
-        <pre><tt>
-                bash
-                . jdk/make/jdk_generic_profile.sh
-                <i>gmake</i> sanity &amp;&amp; <i>gmake</i>
-        </tt></pre>
-    </blockquote>
-    <p>
-    Of course ksh or sh would work too.
-    But some customization will probably be necessary.
-    The <tt>sanity</tt> rule will make some basic checks on build
-    dependencies and generate appropriate warning messages
-    regarding missing, out of date, or newer than expected components
-    found on your system.
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h3><a name="gmake">GNU make (<tt><i>gmake</i></tt>)</a></h3>
-
-<blockquote>
-    <p>
-    The Makefiles in the 
-    OpenJDK 
-    are only valid when used with the 
-    GNU version of the utility command <tt>make</tt>
-    (<tt><i>gmake</i></tt>).
-    A few notes about using GNU make:
-    <ul>
-        <li>
-            In general, you need GNU make version 3.78.1 or newer.
-        </li>
-        <li>
-            Place the location of the GNU make binary in the <tt>PATH</tt>. 
-        </li>
-        <li>
-            <strong>Linux:</strong>
-            The <tt>/usr/bin/make</tt> command should work fine for you.
-        </li>
-        <li>
-            <strong>Solaris:</strong>
-            Do NOT use <tt>/usr/bin/make</tt> on Solaris.
-            If your Solaris system has the software
-            from the Solaris Companion CD installed, 
-            you should use <tt>gmake</tt>
-            which will be located in either the <tt>/opt/sfw/bin</tt> or 
-            <tt>/usr/sfw/bin</tt> directory.
-        </li>
-        <li>
-            <strong>Windows:</strong>
-            Make sure you start your build inside a bash/sh/ksh shell.
-            <br>
-            <b>WARNING:</b> Watch out for make version 3.81, it may
-            not work due to a lack of support for drive letter paths
-            like <tt>C:/</tt>. Use a 3.80 version, or find a newer
-            version that has this problem fixed.
-        </li>
-    </ul>
-    <p>
-    Information on GNU make, and access to ftp download sites, are
-    available on the
-    <a href="http://www.gnu.org/software/make/make.html">
-        GNU make web site
-    </a>.
-    The latest source to GNU make is available at
-    <a href="http://ftp.gnu.org/pub/gnu/make/">ftp.gnu.org/pub/gnu/make/</a>.
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h3><a name="linux">Basic Linux System Setup</a></h3>
-
-<blockquote>
-    <p>
-    <strong>i586 only:</strong>
-    The minimum recommended hardware for building the Linux version
-    is a Pentium class processor or better, at least 256 MB of RAM, and
-    approximately 1.5 GB of free disk space.
-    <p> 
-    <strong>X64 only:</strong>
-    The minimum recommended hardware for building the Linux
-    version is an AMD Opteron class processor, at least 512 MB of RAM, and
-    approximately 4 GB of free disk space.
-    <p> 
-    The build will use the tools contained in 
-    <tt>/bin</tt> and 
-    <tt>/usr/bin</tt>
-    of a standard installation of the Linux operating environment. 
-    You should ensure that these directories are in your 
-    <tt>PATH</tt>.
-    <p>
-    Note that some Linux systems have a habit of pre-populating
-    your environment variables for you, for example <tt>JAVA_HOME</tt>
-    might get pre-defined for you to refer to the JDK installed on
-    your Linux system. 
-    You will need to unset <tt>JAVA_HOME</tt>.
-    It's a good idea to run <tt>env</tt> and verify the
-    environment variables you are getting from the default system
-    settings make sense for building the 
-    OpenJDK.
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-
-<h4><a name="linux_checklist">Basic Linux Check List</a></h4>
-
-<blockquote>
-    <ol>
-        <li>
-            Install the
-            <a href="#bootjdk">Bootstrap JDK</a>, set
-            <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
-        </li>
-        <li>
-            Install the
-            <a href="#binaryplugs">Binary Plugs</a>, set
-            <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>.
-        </li>
-        <li>
-            Install or upgrade the <a href="#freetype">FreeType development
-            package</a>.
-        </li>
-    </ol>
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h3><a name="solaris">Basic Solaris System Setup</a></h3>
-
-<blockquote>
-    <p>
-    The minimum recommended hardware for building the
-    Solaris SPARC version is an UltraSPARC with 512 MB of RAM. 
-    For building
-    the Solaris x86 version, a Pentium class processor or better and at
-    least 128 MB of RAM are recommended. 
-    Approximately 1.4 GB of free disk
-    space is needed for a 32-bit build.
-    <p>
-    If you are building the 64bit version, you should
-    run the command "isainfo -v" to verify that you have a
-    64-bit installation. 
-    An additional 7 GB of free disk space is needed
-    for a 64-bit build.
-    <p> 
-    The build uses the tools contained in <tt>/usr/ccs/bin</tt>
-    and <tt>/usr/bin</tt> of a standard developer or full installation of
-    the Solaris operating environment.
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-
-<h4><a name="solaris_checklist">Basic Solaris Check List</a></h4>
-
-<blockquote>
-    <ol>
-        <li>
-            Install the
-            <a href="#bootjdk">Bootstrap JDK</a>, set
-            <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
-        </li>
-        <li>
-            Install the
-            <a href="#binaryplugs">Binary Plugs</a>, set
-            <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>.
-        </li>
-        <li>
-            Install the
-            <a href="#studio">Sun Studio Compilers</a>, set
-            <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>.
-        </li>
-        <li>
-            Install the
-            <a href="#cups">CUPS Include files</a>, set
-            <tt><a href="#ALT_CUPS_HEADERS_PATH">ALT_CUPS_HEADERS_PATH</a></tt>.
-        </li>
-    </ol>
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h3><a name="windows">Basic Windows System Setup</a></h3>
-
-<blockquote> 
-    <p>
-    <strong>i586 only:</strong>
-    The minimum recommended hardware for building the 32bit or X86
-    Windows version is an Pentium class processor or better, at least
-    512 MB of RAM, and approximately 600 MB of free disk space.
-    <strong>
-        NOTE: The Windows 2000 build machines need to use the
-        file system NTFS. 
-        Build machines formatted to FAT32 will not work 
-        because FAT32 doesn't support case-sensitivity in file names.
-    </strong>
-    <p> 
-    <strong>X64 only:</strong>
-    The minimum recommended hardware for building
-    the Windows X64 version is an AMD Opteron class processor, at least 1
-    GB of RAM, and approximately 10 GB of free disk space.
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-
-<h4><a name="paths">Windows Paths</a></h4>
-
-<blockquote>
-    <p>
-    <strong>Windows:</strong>
-    Note that GNU make is a historic utility and is based very
-    heavily on shell scripting, so it does not tolerate the Windows habit
-    of having spaces in pathnames or the use of the <tt>\</tt>characters in pathnames.
-    Luckily on most Windows systems, you can use <tt>/</tt>instead of \, and
-    there is always a 'short' pathname without spaces for any path that 
-    contains spaces.
-    Unfortunately, this short pathname can be somewhat dynamic and the
-    formula is difficult to explain.
-    You can use <tt>cygpath</tt> utility to map pathnames with spaces
-    or the <tt>\</tt>character into the <tt>C:/</tt> style of pathname
-    (called 'mixed'), e.g.
-    <tt>cygpath -s -m "<i>path</i>"</tt>.
-    <p>
-    The makefiles will try to translate any pathnames supplied
-    to it into the <tt>C:/</tt> style automatically.
-    <p>
-    Note that use of CYGWIN creates a unique problem with regards to
-    setting <a href="#path"><tt>PATH</tt></a>. Normally on Windows
-    the <tt>PATH</tt> variable contains directories
-    separated with the ";" character (Solaris and Linux uses ":").
-    With CYGWIN, it uses ":", but that means that paths like "C:/path"
-    cannot be placed in the CYGWIN version  of <tt>PATH</tt> and
-    instead CYGWIN uses something like <tt>/cygdrive/c/path</tt>
-    which CYGWIN understands, but only CYGWIN understands.
-    So be careful with paths on Windows.
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-
-<h4><a name="windows_checklist">Basic Windows Check List</a></h4>
-
-<blockquote>
-    <ol>
-        <li>
-            Install the
-            <a href="#cygwin">CYGWIN product</a>. 
-        </li>
-        <li>
-            Install the 
-            <a href="#bootjdk">Bootstrap JDK</a>, set
-            <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
-        </li>
-        <li>
-            Install the
-            <a href="#binaryplugs">Binary Plugs</a>, set
-            <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>..
-        </li>
-        <li>
-            Install the
-            <a href="#msvc">Microsoft Visual Studio .NET 2003 Professional</a> or the 
-            <a href="#mssdk">Microsoft Platform SDK</a>.
-        </li>
-        <li>
-            Setup all environment variables for compilers 
-            (see <a href="#msvc">compilers</a>).
-        </li>
-        <li>
-            Install 
-            <a href="#dxsdk">Microsoft DirectX SDK</a>.
-        </li>
-    </ol>
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h3><a name="dependencies">Build Dependencies</a></h3>
-
-<blockquote>
-    <p>
-    Depending on the platform, the 
-    OpenJDK 
-    build process has some basic
-    dependencies on components not part of the 
-    OpenJDK 
-    sources.
-    Some of these are specific to a platform, some even specific to
-    an architecture.
-    Each dependency will have a set of ALT variables that can be set
-    to tell the makefiles where to locate the component.
-    In most cases setting these ALT variables may not be necessary
-    and the makefiles will find defaults on the system in standard
-    install locations or through component specific variables.
-    
-    <h4><a name="bootjdk">Bootstrap JDK</a></h4>
-    
-    <blockquote>
-        <p>
-        All 
-        OpenJDK 
-        builds require access to the previously released 
-        JDK 6, this is often called a bootstrap JDK.
-        The JDK 6 binaries can be downloaded from Sun's 
-        <a href="http://java.sun.com/javase/1.6.0/download.html">JDK 6 download site</a>.
-        For build performance reasons
-        is very important that this bootstrap JDK be made available on the
-        local disk of the machine doing the build.
-        You should always set 
-        <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>
-        to point to the location of
-        the bootstrap JDK installation, this is the directory pathname
-        that contains a <tt>bin, lib, and include</tt>
-        It's also a good idea to also place its <tt>bin</tt> directory
-        in the <tt>PATH</tt> environment variable, although it's
-        not required.
-        <p>
-        <strong>Solaris:</strong>
-        Some pre-installed JDK images may be available to you in the
-        directory <tt>/usr/jdk/instances</tt>.
-        If you don't set
-        <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>
-        the makefiles will look in that location for a JDK it can use.
-    </blockquote>
-    
-    <h4><a name="binaryplugs">Binary Plugs</a></h4>
-    
-    <blockquote>
-        <p>
-        Not all of the source code that makes up the JDK is available
-        under an open-source license.
-        In order to build an OpenJDK binary from source code,
-        you must first download and install the appropriate
-        binary plug bundles from the OpenJDK Download area.
-        During the OpenJDK build process these "binary plugs"
-        for the encumbered components will be copied into your
-        resulting OpenJDK binary build image.
-        These binary plug files are only for the purpose of
-        building an OpenJDK binary.
-        Download the Binary Plugs by selecting the <b>Downloads</b>
-        link at
-        <a href="http://openjdk.java.net/">the OpenJDK site</a>,
-        install the bundle,
-        and make sure you set
-        <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>
-        to the root of this installation.
-    </blockquote>
-    
-    <h4><a name="cacerts">Certificate Authority File (cacert)</a></h4>
-    
-    <blockquote>
-        <p>
-        See <a href="http://en.wikipedia.org/wiki/CAcert">
-        www.wikipedia.org/wiki/CAcert</a>
-        for a better understanding of the Certificate Authority (CA).
-        A certificates file named "cacerts"
-        represents a system-wide keystore with CA certificates. 
-        In JDK and JRE
-        binary bundles, the "cacerts" file contains root CA certificates from
-        several public CAs (e.g., VeriSign, Thawte, and Baltimore).
-        The source contain a cacerts file
-        without CA root certificates. 
-        Formal JDK builders will need to secure
-        permission from each public CA and include the certificates into their
-        own custom cacerts file. 
-        Failure to provide a populated cacerts file
-        will result in verification errors of a certificate chain during runtime.
-        The variable 
-        <tt><a href="#ALT_CACERTS_FILE">ALT_CACERTS_FILE</a></tt>
-        can be used to override the default location of the
-        cacerts file that will get placed in your build.
-        By default an empty cacerts file is provided and that should be
-        fine for most JDK developers.
-    </blockquote>
-    
-    <h4><a name="compilers">Compilers</a></h4>
-    
-    <blockquote>
-        
-        <a name="gcc">
-            <strong>Linux gcc/binutils</strong>
-        </a>
-        
-        <blockquote>
-            <p>
-            The GNU gcc compiler version should be 3.2.2 or newer.
-            The binutils package should be 2.11.93.0.2-11 or newer.
-            The compiler used should be the default compiler installed
-            in <tt>/usr/bin</tt>.
-        </blockquote>
-        
-        <strong><a name="studio">Solaris: Sun Studio</a></strong>
-        
-        <blockquote>
-            <p>
-            At a minimum, the
-            <a href="http://developers.sun.com/sunstudio/index.jsp">
-            Sun Studio 11 Compilers</a>
-            (containing version 5.8 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">
-            SunSolve web site</a>.
-            <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:
-            <a href="http://developers.sun.com/sunstudio/downloads/express.jsp">
-            Sun Studio Express Download site</a>
-            are also an option, although these compilers have not
-            been extensively used yet.
-        </blockquote>
-        
-        <a name="msvc">
-            <strong>Windows i586: Microsoft Visual Studio .NET 2003 Professional</strong>
-        </a>
-        
-        <blockquote>
-            <p>
-            The 32-bit 
-            OpenJDK
-            Windows build
-            requires Microsoft Visual Studio .NET 2003 (VS2003) Professional
-            Edition compiler. 
-            The compiler and other tools are expected to reside
-            in the location defined by the variable <tt>VS71COMNTOOLS</tt> which
-            is set by the Microsoft Visual Studio .NET installer.
-            <p> 
-            Once the compiler is installed, 
-            it is recommended that you run <tt>VCVARS32.BAT</tt> 
-            to set the compiler environment variables
-            <tt>MSVCDIR</tt>, 
-            <tt>INCLUDE</tt>,
-            <tt>LIB</tt>, and
-            <tt>PATH</tt> 
-            prior to building the 
-            OpenJDK.
-            The above environment variables <b>MUST</b> be set.
-            <p>
-            The Microsoft Visual Studio .NET 2005 (VS2005) compiler
-            will not work at this time due to the new runtime dll
-            and the manifest requirements.
-        </blockquote>
-        
-        <a name="mssdk">
-            <strong>Windows X64: Microsoft Platform SDK April 2005</strong>
-        </a>
-        
-        <blockquote>
-            <p>
-            On <b>X64</b>,
-            the Microsoft Platform Software
-            Development Kit (SDK), April 2005 Edition compiler, is required for
-            building the 
-            OpenJDK
-            because it contains the C/C++ compiler. 
-            You will need to minimally install the Core SDK and
-            the MDAC SDK features of this compiler.
-            <p>
-            Once the Platform SDK is installed,
-            it is recommended that you run <tt>SetEnv.Cmd /X64</tt> 
-            to set the compiler environment variables
-            <tt>MSSDK</tt>, 
-            <tt>MSTOOLS</tt>,
-            <tt>INCLUDE</tt>,
-            <tt>LIB</tt>, and
-            <tt>PATH</tt> 
-            prior to building the 
-            OpenJDK.
-            The above environment variables <b>MUST</b> be set.
-            <p>
-            Note that this compiler may say it's version is a
-            Microsoft Visual Studio .NET 2005 (VS2005), but be careful,
-            it will not match the official VS2005 product.
-            This Platform SDK compiler is only used on X64 builds.
-        </blockquote>
-        
-    </blockquote>
-    
-    <h4><a name="cups">Common UNIX Printing System (CUPS) Headers (Solaris &amp; Linux)</a></h4>
-    
-    <blockquote>
-        <p>
-        <strong>Solaris:</strong>
-        CUPS header files are required for building the 
-        OpenJDK on Solaris.
-        The Solaris header files can be obtained by installing 
-        the package <strong>SFWcups</strong> from the Solaris Software
-        Companion CD/DVD, these often will be installed into 
-        <tt>/opt/sfw/cups</tt>.
-        <p>
-        <strong>Linux:</strong>
-        CUPS header files are required for building the 
-        OpenJDK on Linux.
-        The Linux header files are usually available from a "cups"
-        development package, it's recommended that you try and use
-        the package provided by the particular version of Linux that
-        you are using.
-        <p>
-        The CUPS header files can always be downloaded from 
-        <a href="http://www.cups.org">www.cups.org</a>.
-        The variable 
-        <tt><a href="#ALT_CUPS_HEADERS_PATH">ALT_CUPS_HEADERS_PATH</a></tt>
-        can be used to override the default location of the
-        CUPS Header files.
-    </blockquote>
-    
-    <h4><a name="freetype">FreeType 2</a></h4>
-
-    <blockquote>
-        <p>
-        Version 2.3 or newer of FreeType is required for building the OpenJDK.
-        On Unix systems required files can be available as part of your
-        distribution (while you still may need to upgrade them).
-        Note that you need development version of package that 
-        includes both FreeType library and header files.
-        </p>
-        <p>
-        You can always download latest FreeType version from the
-        <a href="http://www.freetype.org">FreeType website</a>.
-        </p>
-        <p>
-        Makefiles will try to pick FreeType from /usr/lib and /usr/include.
-        In case it is installed elsewhere you will need to set environment
-        variables 
-        <tt><a href="#ALT_FREETYPE_LIB_PATH">ALT_FREETYPE_LIB_PATH</a></tt>
-        and 
-        <tt><a href="#ALT_FREETYPE_HEADERS_PATH">ALT_FREETYPE_HEADERS_PATH</a></tt>
-        to refer to place where library and header files are installed.
-        </p>
-    </blockquote>    
-
-    <h4><a name="alsa">Advanced Linux Sound Architecture (ALSA) (Linux only)</a></h4>
-    
-    <blockquote>
-        <p>
-        <strong>Linux only:</strong>
-        Version 0.9.1 or newer of the ALSA files are
-        required for building the 
-        OpenJDK on Linux.
-        These Linux files are usually available from an "alsa"
-        of "libasound"
-        development package, it's recommended that you try and use
-        the package provided by the particular version of Linux that
-        you are using.
-        The makefiles will check this emit a sanity error if it is
-        missing or the wrong version.
-        As a last resort you can go to the
-        <a href="http://www.alsa-project.org" target="_blank">
-        Advanced Linux Sound Architecture Site</a>.
-    </blockquote>
-    
-    <h4>Windows Specific Dependencies</h4>
-    
-    <blockquote>
-        
-        <strong>Unix Command Tools (<a name="cygwin">CYGWIN</a>)</strong>
-        
-        <blockquote> 
-            <p>
-            The 
-            OpenJDK
-            requires access to a set of unix command tools
-            on Windows which can be supplied by 
-            <a href="http://www.cygwin.com">CYGWIN</a>. 
-            <p>
-            The 
-            OpenJDK 
-            build
-            requires CYGWIN version 1.5.12 or newer. 
-            Information about CYGWIN can
-            be obtained from the CYGWIN website at 
-            <a href="http://www.cygwin.com">www.cygwin.com</a>. 
-            <p>
-            By default CYGWIN doesn't install all the tools required for building
-            the OpenJDK.
-            Along with the default installation, you need to install
-            the following tools.
-            <blockquote>
-                <table border="1">
-                    <thead>
-                        <tr>
-                            <td>Binary Name</td>
-                            <td>Package</td>
-                            <td>Description</td>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td>ar.exe</td>
-                            <td>Devel</td>
-                            <td>binutils: The GNU assembler, linker and binary
-                            utilities</td>
-                        </tr>
-                        <tr>
-                            <td>make.exe</td>
-                            <td>Devel</td>
-                            <td>make: The GNU version of the 'make' utility</td>
-                        </tr>
-                        <tr>
-                            <td>m4.exe</td>
-                            <td>Interpreters</td>
-                            <td>m4: GNU implementation of the traditional Unix macro
-                            processor</td>
-                        </tr>
-                        <tr>
-                            <td>cpio.exe</td>
-                            <td>Utils</td>
-                            <td>cpio: A program to manage archives of files</td>
-                        </tr>
-                        <tr>
-                            <td>file.exe</td>
-                            <td>Utils</td>
-                            <td>file: Determines file type using 'magic' numbers</td>
-                        </tr>
-                    </tbody>
-                </table>
-            </blockquote>
-        </blockquote>
-        
-        <a name="dxsdk">
-            <strong>Microsoft DirectX 9.0 SDK header files and libraries</strong>
-        </a>
-        
-        <blockquote>
-            <p>
-            Microsoft DirectX 9.0 SDK (Summer 2004)
-            headers are required for building
-            OpenJDK.
-            This SDK can be downloaded from 
-            <a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=FD044A42-9912-42A3-9A9E-D857199F888E&amp;displaylang=en">
-            Microsoft DirectX 9.0 SDK (Summer 2004)</a>.
-            If the link above becomes obsolete, the SDK can be found from 
-            <a href="http://download.microsoft.com">the Microsoft Download Site</a>
-            (search with "DirectX 9.0 SDK Update Summer 2004"). 
-            The location of this SDK can be set with 
-            <tt><a href="#ALT_DXSDK_PATH">ALT_DXSDK_PATH</a></tt>
-            but it's normally found via the DirectX environment variable
-            <tt>DXSDK_DIR</tt>.
-        </blockquote>
-        
-        <a name="msvcrt">
-            <strong><tt>MSVCRT.DLL</tt></strong>
-        </a>
-        
-        <blockquote> 
-            <p>
-            <strong>i586 only:</strong>
-            The 
-            OpenJDK
-            32bit build requires
-            access to <tt>MSVCRT.DLL</tt> 
-            version 6.00.8337.0 or newer.
-            If the <tt>MSVCRT.DLL</tt> is not installed in 
-            the system32 directory set the 
-            <a href="#ALT_MSVCRT_DLL_PATH"><tt>ALT_MSVCRT_DLL_PATH</tt></a>
-            variable to the location.
-            <p> 
-            <strong>X64 only:</strong>
-            The OpenJDK 64bit build requires access to
-            <tt>MSVCRT.DLL</tt> version 7.0.3790.0 or newer, which is
-            usually supplied by the
-            <a href="#mssdk">Platform SDK</a>.
-            If it is not available from the Platform SDK,
-            set the 
-            <a href="#ALT_MSVCRT_DLL_PATH"><tt>ALT_MSVCRT_DLL_PATH</tt></a>
-            variable to the location.
-        </blockquote>
-        
-        <a name="msvcr71">
-            <strong><tt>MSVCR71.DLL</tt></strong>
-        </a>
-        
-        <blockquote>
-            <p>
-            <strong>i586 only:</strong>
-            The 
-            OpenJDK
-            build requires access to 
-            MSVCR71.DLL version 7.10.3052.4 or newer which should be
-            supplied by the
-            <a href="#msvc">Visual Studio product</a>
-            If the <tt>MSVCR71.DLL</tt> is not available from the
-            Visual Studio product
-            set the 
-            <a href="#ALT_MSVCR71_DLL_PATH"><tt>ALT_MSVCR71_DLL_PATH</tt></a>
-            variable to the location.
-        </blockquote>
-        
-    </blockquote>
-    
-    
-</blockquote>
-
-
-<hr noshade="noshade" size="3">
-
-<h2><a name="creating">Creating the Build</a></h2>
-
-<blockquote>
-    <p>
-    Once a machine is setup to build the 
-    OpenJDK,
-    the steps to create the
-    build are fairly simple.
-    The various ALT settings can either be made into  variables
-    or can be supplied on the 
-    <a href="#gmake"><tt><i>gmake</i></tt></a> 
-    command.
-    <p>
-    <ol>
-        <li>Use the sanity rule to double check all the ALT settings:
-            <blockquote>
-                <tt>
-                    <i>gmake</i> 
-                    sanity
-                    [ARCH_DATA_MODEL=<i>32 or 64</i>]
-                    [other "ALT_" overrides]
-                </tt>
-            </blockquote>
-        </li>
-        <li>Start the build with the command:
-            <blockquote>
-                <tt>
-                    <i>gmake</i> 
-                    [ARCH_DATA_MODEL=<i>32 or 64</i>]
-                    [ALT_OUTPUTDIR=<i>output_directory</i>] 
-                    [other "ALT_" overrides] 
-                </tt>
-            </blockquote>
-        </li>
-    </ol>
-    <p>
-    <strong>Solaris:</strong>
-    Note that ARCH_DATA_MODEL is really only needed on Solaris to
-    indicate you want to built the 64-bit version.
-    And before the Solaris 64-bit binaries can be used, they
-    must be merged with the binaries from a separate 32-bit build. 
-    The merged binaries may then be used in either 32-bit or 64-bit mode, with
-    the selection occurring at runtime 
-    with the <tt>-d32</tt> or <tt>-d64</tt> options. 
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h2><a name="testing">Testing the Build</a></h2>
-
-<blockquote>
-    <p>
-    When the build is completed, you should see the generated
-    binaries and associated files in the <tt>j2sdk-image</tt> 
-    directory in the output directory. 
-    The default output directory is
-    <tt>build/<i>platform</i></tt>,
-    where <tt><i>platform</i></tt> is one of
-    <tt><ul>
-            <li>solaris-sparc</li>
-            <li>solaris-sparcv9</li>
-            <li>solaris-i586</li>
-            <li>solaris-amd64</li>
-            <li>linux-i586</li>
-            <li>linux-amd64</li>
-            <li>windows-i586</li>
-            <li>windows-amd64</li>
-    </ul></tt>
-    In particular, the 
-    <tt>build/<i>platform</i>/j2sdk-image/bin</tt>
-    directory should contain executables for the 
-    OpenJDK
-    tools and utilities.
-    <p>
-    You can test that the build completed properly by using the build
-    to run the various demos that you will find in the 
-    <tt>build/<i>platform</i>/j2sdk-image/demo</tt>
-    directory.
-    <p>
-    The provided regression tests can be run with the <tt>jtreg</tt>
-    utility from 
-    <a href="http://openjdk.java.net/jtreg/">the jtreg site</a>.
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h2><a name="variables">Environment/Make Variables</a></h2>
-
-<p>
-Some of the
-environment or make variables (just called <b>variables</b> in this
-document) that can impact the build are:
-
-<blockquote>
-    
-    <dl>
-        
-        <dt><a name="path"><tt>PATH</tt></a> </dt>
-        <dd>Typically you want to set the <tt>PATH</tt> to include:
-            <ul>
-                <li>The location of the GNU make binary</li>
-                <li>The location of the JDK 6 <tt>java</tt> 
-                (see <a href="#bootjdk">Bootstrap JDK</a>)</li>
-                <li>The location of the C/C++ compilers 
-                (see <a href="#compilers"><tt>compilers</tt></a>)</li>
-                <li>The location or locations for the Unix command utilities
-                (e.g. <tt>/usr/bin</tt>)</li>
-            </ul>
-        </dd>
-        
-        <dt><a name="arch_data_model"><tt>ARCH_DATA_MODEL</tt></a></dt>
-        <dd>The <tt>ARCH_DATA_MODEL</tt> variable
-            is used to specify whether the build is to generate 32-bit or 64-bit
-            binaries. 
-            The Solaris build supports either 32-bit or 64-bit builds, but
-            Windows and Linux will support only one, depending on the specific
-            OS being used.
-            Normally, setting this variable is only necessary on Solaris.
-            Set <tt>ARCH_DATA_MODEL</tt> to <tt>32</tt> for generating 32-bit binaries, 
-            or to <tt>64</tt> for generating 64-bit binaries.
-        </dd>
-        
-        <dt><a name="ALT_BOOTDIR"><tt>ALT_BOOTDIR</tt></a></dt>
-        <dd>
-            The location of the bootstrap JDK installation. 
-            See <a href="#bootjdk">Bootstrap JDK</a> for more information.
-            You should always install your own local Bootstrap JDK and
-            always set <tt>ALT_BOOTDIR</tt> explicitly.
-        </dd>
-        
-        <dt><a name="ALT_OUTPUTDIR"><tt>ALT_OUTPUTDIR</tt></a> </dt>
-        <dd>
-            An override for specifying the (absolute) path of where the
-            build output is to go.
-            The default output directory will be build/<i>platform</i>.
-        </dd>
-        
-        <dt><a name="ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a> </dt>
-        <dd>
-            The location of the C/C++ compiler.
-            The default varies depending on the platform. 
-        </dd>
-        
-        <dt><tt><a name="ALT_CACERTS_FILE">ALT_CACERTS_FILE</a></tt></dt>
-        <dd>
-            The location of the <a href="#cacerts">cacerts</a> file.
-            The default will refer to 
-            <tt>jdk/src/share/lib/security/cacerts</tt>.
-        </dd>
-        
-        <dt><a name="ALT_BINARY_PLUGS_PATH"><tt>ALT_BINARY_PLUGS_PATH</tt></a></dt>
-        <dd>
-            The location of the binary plugs installation.
-            See <a href="#binaryplugs">Binary Plugs</a> for more information.
-            You should always have a local copy of a
-            recent Binary Plugs install image
-            and set this variable to that location.
-        </dd>
-        
-        <dt><a name="ALT_CUPS_HEADERS_PATH"><tt>ALT_CUPS_HEADERS_PATH</tt></a> </dt>
-        <dd>
-            The location of the CUPS header files.
-            See <a href="#cups">CUPS information</a> for more information.
-            If this path does not exist the fallback path is 
-            <tt>/usr/include</tt>.
-        </dd>
-        
-        
-        <dt><a name="ALT_FREETYPE_LIB_PATH"><tt>ALT_FREETYPE_LIB_PATH</tt></a></dt>
-        <dd>
-            The location of the FreeType shared library. 
-            See <a href="#freetype">FreeType information</a> for details. 
-        </dd>
-        
-        <dt><a name="ALT_FREETYPE_HEADERS_PATH"><tt>ALT_FREETYPE_HEADERS_PATH</tt></a></dt>
-        <dd>
-            The location of the FreeType header files.
-            See <a href="#freetype">FreeType information</a> for details. 
-        </dd>
-        
-        <dt><strong>Windows specific:</strong></dt>
-        <dd>
-            <dl>
-                <dt><a name="ALT_MSDEVTOOLS_PATH"><tt>ALT_MSDEVTOOLS_PATH</tt></a> </dt>
-                <dd>
-                    The location of the Microsoft Visual Studio .NET 2003
-                    tools 'bin' directory.
-                    The default is usually derived from
-                    <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>.
-                </dd>
-                
-                <dt><tt><a name="ALT_DXSDK_PATH">ALT_DXSDK_PATH</a></tt> </dt>
-                <dd>
-                    The location of the 
-                    <a href="#dxsdk">Microsoft DirectX 9 SDK</a>.
-                    The default will be to try and use the DirectX environment
-                    variable <tt>DXSDK_DIR</tt>,
-                    failing that, look in <tt>C:/DXSDK</tt>.
-                </dd>
-                
-                <dt><tt><a name="ALT_MSVCRT_DLL_PATH">ALT_MSVCRT_DLL_PATH</a></tt> </dt>
-                <dd>
-                    The location of the 
-                    <a href="#msvcrt"><tt>MSVCRT.DLL</tt></a>. 
-                </dd>
-                
-                <dt><tt><a name="ALT_MSVCR71_DLL_PATH">ALT_MSVCR71_DLL_PATH</a></tt> </dt>
-                <dd>
-                    <strong>i586 only:</strong>
-                    The location of the 
-                    <a href="#msvcr71"><tt>MSVCR71.DLL</tt></a>. 
-                </dd>
-            </dl>
-        </dd>
-        
-    </dl>
-</blockquote>
-
-<!-- ------------------------------------------------------ -->
-<hr noshade="noshade" size="3">
-
-<h2><a name="troubleshooting">Troubleshooting</a></h2>
-
-<blockquote>
-    <p>
-    A build can fail for any number of reasons. 
-    Most failures
-    are a result of trying to build in an environment in which all the
-    pre-build requirements have not been met. 
-    The first step in
-    troubleshooting a build failure is to recheck that you have satisfied
-    all the pre-build requirements for your platform.
-    Look for the check list of the platform you are building on in the
-    <a href="#contents">Table of Contents</a>.
-    
-    <p>
-    You can validate your build environment by using the <tt>sanity</tt>
-    target.
-    Any errors listed
-    will stop the build from starting, and any warnings may result in
-    a flawed product build.
-    We strongly encourage you to evaluate every
-    sanity check warning and fix it if required, before you proceed
-    further with your build.
-    
-    <p>
-    Some of the more common problems with builds are briefly described
-    below, with suggestions for remedies.
-    
-    <ul>
-        <li>
-            <b>Slow Builds:</b>
-            <blockquote>
-                <p>
-                If your build machine seems to be overloaded from too many
-                simultaneous C++ compiles, try setting the <tt>HOTSPOT_BUILD_JOBS</tt>
-                variable to <tt>1</tt> (if you're using a multiple CPU
-                machine, setting it to more than the the number of CPUs is probably
-                not a good idea).
-                <p>
-                Creating the javadocs can be very slow, if you are running
-                javadoc, consider skipping that step.
-                <p>
-                Faster hardware and more RAM always helps too.
-                The VM build tends to be CPU intensive (many C++ compiles),
-                and the rest of the JDK will often be disk intensive.
-                <p>
-                Faster compiles are possible using a tool called
-                <a href="http://ccache.samba.org/">ccache</a>.
-            </blockquote>
-        </li>
-        <li>
-            <b>File time issues:</b>
-            <blockquote>
-                <p>
-                If you see warnings that refer to file time stamps, e.g.
-                <blockquote>
-                    <i>Warning message:</i><tt> File `xxx' has modification time in
-                    the future.</tt>
-                    <br>
-                    <i>Warning message:</i> <tt> Clock skew detected. Your build may
-                    be incomplete.</tt> 
-                </blockquote>
-                <p>
-                These warnings can occur when the clock on the build machine is out of
-                sync with the timestamps on the source files. Other errors, apparently
-                unrelated but in fact caused by the clock skew, can occur along with
-                the clock skew warnings. These secondary errors may tend to obscure the
-                fact that the true root cause of the problem is an out-of-sync clock.
-                For example, an out-of-sync clock has been known to cause an old
-                version of javac to be used to compile some files, resulting in errors
-                when the pre-1.4 compiler ran across the new <tt>assert</tt> keyword
-                in the 1.4 source code.
-                <p>
-                If you see these warnings, reset the clock on the build
-                machine, run "<tt><i>gmake</i> clobber</tt>" or delete the directory
-                containing the build output, and restart the build from the beginning.
-            </blockquote>
-        </li>
-        <li>
-            <b>Error message: <tt>Trouble writing out table to disk</tt></b>
-            <blockquote>
-                <p>
-                Increase the amount of swap space on your build machine.
-            </blockquote>
-        </li>
-        <li>
-            <b>Error Message: <tt>libstdc++ not found:</tt></b>
-            <blockquote>
-                This is caused by a missing libstdc++.a library.
-                This is installed as part of a specific package
-                (e.g. libstdc++.so.devel.386).
-                By default some 64bit Linux versions (e.g. Fedora)
-                only install the 64bit version of the libstdc++ package.
-                Various parts of the JDK build require a static
-                link of the C++ runtime libraries to allow for maximum
-                portability of the built images.
-            </blockquote>
-        </li>
-        <li>
-            <b>Error Message: <tt>cannot restore segment prot after reloc</tt></b>
-            <blockquote>
-                This is probably an issue with SELinux (See
-                <a href="http://en.wikipedia.org/wiki/SELinux">http://en.wikipedia.org/wiki/SELinux</a>).
-                Parts of the VM is built without the <tt>-fPIC</tt> for
-                performance reasons.
-                <p>
-                To completely disable SELinux:
-                <ol><tt>
-                    
-                    <li>$ su root</li>
-                    <li># system-config-securitylevel</li>
-                    <li>In the window that appears, select the SELinux tab</li>
-                    <li>Disable SELinux</li>
-                </ol></tt>
-                <p>
-                Alternatively, instead of completely disabling it you could
-                disable just this one check.
-                <ol><tt>
-                    <li>Select System->Administration->SELinux Management</li>
-                    <li>In the SELinux Management Tool which appears, 
-                    select "Boolean" from the menu on the left</li>
-                    <li>Expand the "Memory Protection" group</li>
-                    <li>Check the first item, labeled
-                    "Allow all unconfined executables to use libraries requiring text relocation ..."</li>
-                </ol></tt>
-            </blockquote>
-        </li>
-    </ul>
-</blockquote>
-
-<hr noshade="noshade" size="3">
--- a/make/README.html	Wed Aug 06 15:02:15 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    
-    <head> <title>OpenJDK README</title> </head>
-    
-    <!-- ====================================================== -->
-    <hr noshade="noshade" size="3">
-    <center>
-        <h1>OpenJDK README</h1>
-    </center>
-    
-    <!-- ------------------------------------------------------ --> 
-    <hr noshade="noshade" size="3">
-    
-    <h2>TBD</h2>
-    
-    <h2>Building the OpenJDK</h2>
-    
-    <p>
-    Refer to <a href="README-builds.html">the OpenJDK Build README</a>
-    for build instructions.
-    
-    <!-- ====================================================== -->
-    
-    <hr noshade="noshade" size="3">
-    
-    </body>
-</html>
--- a/make/common/Defs-linux.gmk	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/common/Defs-linux.gmk	Wed Aug 06 16:43:53 2008 -0700
@@ -86,18 +86,22 @@
 #
 # Default optimization
 #
-CC_HIGHEST_OPT = -O3
-CC_HIGHER_OPT  = -O3
-CC_LOWER_OPT   = -O2
-CC_NO_OPT      =
 
-ifeq ($(PRODUCT), java)
-    _OPT = $(CC_HIGHER_OPT)
-else
-    _OPT = $(CC_LOWER_OPT)
-    CPPFLAGS_DBG    += -DLOGGING 
+ifndef OPTIMIZATION_LEVEL
+  ifeq ($(PRODUCT), java)
+    OPTIMIZATION_LEVEL = HIGHER
+  else
+    OPTIMIZATION_LEVEL = LOWER
+  endif
 endif
 
+CC_OPT/NONE     = 
+CC_OPT/LOWER    = -O2
+CC_OPT/HIGHER   = -O3
+CC_OPT/HIGHEST  = -O3
+
+CC_OPT          = $(CC_OPT/$(OPTIMIZATION_LEVEL))
+
 # For all platforms, do not omit the frame pointer register usage. 
 #    We need this frame pointer to make it easy to walk the stacks.
 #    This should be the default on X86, but ia64 and amd64 may not have this
@@ -112,18 +116,6 @@
 CFLAGS_REQUIRED         =  $(CFLAGS_REQUIRED_$(ARCH))
 LDFLAGS_COMMON          += $(LDFLAGS_COMMON_$(ARCH))
 
-# Add in platform specific optimizations for all opt levels
-CC_HIGHEST_OPT += $(_OPT_$(ARCH))
-CC_HIGHER_OPT  += $(_OPT_$(ARCH))
-CC_LOWER_OPT   += $(_OPT_$(ARCH))
-
-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off
-ifdef NO_OPTIMIZATIONS
-  CC_HIGHEST_OPT = $(CC_NO_OPT)
-  CC_HIGHER_OPT  = $(CC_NO_OPT)
-  CC_LOWER_OPT   = $(CC_NO_OPT)
-endif
-
 #
 # Selection of warning messages
 #
@@ -162,19 +154,19 @@
   endif
 endif
 
-CFLAGS_OPT      = $(POPT)
+CFLAGS_OPT      = $(CC_OPT)
 CFLAGS_DBG      = $(DEBUG_FLAG)
 CFLAGS_COMMON += $(CFLAGS_REQUIRED)
 
 CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
-CXXFLAGS_OPT	= $(POPT)
+CXXFLAGS_OPT	= $(CC_OPT)
 CXXFLAGS_DBG	= $(DEBUG_FLAG)
 CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
 
 # FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
 ifeq ($(FASTDEBUG), true)
-  CFLAGS_DBG    += $(CC_LOWER_OPT)
-  CXXFLAGS_DBG	+= $(CC_LOWER_OPT)
+  CFLAGS_DBG    += $(CC_OPT/LOWER)
+  CXXFLAGS_DBG	+= $(CC_OPT/LOWER)
 endif
 
 CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
@@ -186,6 +178,9 @@
 
 CPPFLAGS_OPT    = 
 CPPFLAGS_DBG    = -DDEBUG
+ifneq ($(PRODUCT), java)
+  CPPFLAGS_DBG    += -DLOGGING 
+endif
 
 ifdef LIBRARY
   # Libraries need to locate other libraries at runtime, and you can tell
--- a/make/common/Defs-solaris.gmk	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/common/Defs-solaris.gmk	Wed Aug 06 16:43:53 2008 -0700
@@ -86,15 +86,16 @@
 #
 # Java default optimization (-x04/-O2) etc.  Applies to the VM.
 #
-ifeq ($(PRODUCT), java)
-    _OPT = $(CC_HIGHER_OPT)
-else
-    _OPT = $(CC_LOWER_OPT)
-    CPPFLAGS_DBG    += -DLOGGING -DDBINFO
+ifndef OPTIMIZATION_LEVEL
+  ifeq ($(PRODUCT), java)
+    OPTIMIZATION_LEVEL = HIGHER
+  else
+    OPTIMIZATION_LEVEL = LOWER
+  endif
 endif
 
 #
-# If -Xa is in CFLAGS_COMMON it will end up ahead of $(POPT) for the
+# If -Xa is in CFLAGS_COMMON it will end up ahead of $(CC_OPT) for the
 # optimized build, and that ordering of the flags completely freaks
 # out cc.  Hence, -Xa is instead in each CFLAGS variant.
 #
@@ -123,8 +124,8 @@
 #
 # Debug flag for C and C++ compiler
 #
-CFLAGS_DEBUG_OPTION=-g
-CXXFLAGS_DEBUG_OPTION=-g
+CFLAGS_DEBUG_OPTION    = -g $(CC_OPT/NONE)
+CXXFLAGS_DEBUG_OPTION  = -g $(CXX_OPT/NONE)
 
 # Turn off -g if we are doing tcov build
 ifdef TCOV_BUILD
@@ -142,9 +143,8 @@
 #        Performance/size of files should be about the same, maybe smaller.
 #
 ifeq ($(FASTDEBUG), true)
-  CC_FASTDEBUG_OPT       = $(CC_LOWER_OPT)
-  CFLAGS_DEBUG_OPTION    = -g   $(CC_FASTDEBUG_OPT)
-  CXXFLAGS_DEBUG_OPTION  = -g0  $(CC_FASTDEBUG_OPT)
+  CFLAGS_DEBUG_OPTION    = -g  $(CC_OPT/LOWER)
+  CXXFLAGS_DEBUG_OPTION  = -g0 $(CXX_OPT/LOWER)
 endif
 
 CFLAGS_COMMON   = -L$(OBJDIR)
@@ -160,7 +160,7 @@
 CXXFLAGS_COMMON += -errtags=yes
 
 # Optimization flags
-CFLAGS_OPT      = $(POPT)
+CFLAGS_OPT      = $(CC_OPT)
 
 # Debug version flags
 CFLAGS_DBG      = $(CFLAGS_DEBUG_OPTION)
@@ -197,7 +197,7 @@
   CXXFLAGS_COMMON += -errwarn=%all
 endif
 
-CXXFLAGS_OPT	= $(POPT)
+CXXFLAGS_OPT	= $(CXX_OPT)
 CXXFLAGS_DBG	= $(CXXFLAGS_DEBUG_OPTION)
 CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
 
@@ -267,6 +267,10 @@
 CPPFLAGS_OPT    = -DNDEBUG
 CPPFLAGS_DBG    = -DDEBUG
 
+ifneq ($(PRODUCT), java)
+  CPPFLAGS_DBG    += -DLOGGING -DDBINFO
+endif
+
 ifeq ($(ARCH_FAMILY), i586)
   # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
   #   Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
@@ -410,63 +414,151 @@
 # Different "levels" of optimization.
 #
 ifeq ($(CC_VERSION),gcc)
-  CC_HIGHEST_OPT = -O3
-  CC_HIGHER_OPT  = -O3
-  CC_LOWER_OPT   = -O2
+  
+  CC_OPT/NONE     =
+  CC_OPT/LOWER    = -O2
+  CC_OPT/HIGHER   = -O3
+  CC_OPT/HIGHEST  = -O3
+
+  CXX_OPT/NONE    =
+  CXX_OPT/LOWER   = -O2
+  CXX_OPT/HIGHER  = -O3
+  CXX_OPT/HIGHEST = -O3
+
   CFLAGS_REQUIRED_i586  += -fno-omit-frame-pointer
   CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer
+  
   # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
   #   (See Rules.gmk) May need to wait for gcc 5?
   AUTOMATIC_PCH_OPTION = 
+
 else
+  
   # Highest could be -xO5, but indications are that -xO5 should be reserved
   #    for a per-file use, on sources with known performance impacts.
-  CC_HIGHEST_OPT = -xO4
-  CC_HIGHER_OPT  = -xO4
-  CC_LOWER_OPT   = -xO2
+  OPT_LEVEL/LOWER    = 2
+  OPT_LEVEL/HIGHER   = 4
+  OPT_LEVEL/HIGHEST  = 4
+  
+  CC_OPT/NONE     =
+  CC_OPT/LOWER    = $(OPT_LEVEL/LOWER:%=-xO%)
+  CC_OPT/HIGHER   = $(OPT_LEVEL/HIGHER:%=-xO%)
+  CC_OPT/HIGHEST  = $(OPT_LEVEL/HIGHEST:%=-xO%)
+  
+  CXX_OPT/NONE    =
+  CXX_OPT/LOWER   = $(OPT_LEVEL/LOWER:%=-xO%)
+  CXX_OPT/HIGHER  = $(OPT_LEVEL/HIGHER:%=-xO%)
+  CXX_OPT/HIGHEST = $(OPT_LEVEL/HIGHEST:%=-xO%)
+    
+  # We need stack frames at all times
+  USE_XKEEPFRAME_OPTION = false
+  ifeq ($(USE_XKEEPFRAME_OPTION),true)
+    
+    # Unknown spelling on this option at this time (Maybe in SS13?)
+    CC_XKEEPFRAME_OPTIONS  = -xkeepframe
+    CXX_XKEEPFRAME_OPTIONS = -xkeepframe
+  
+  else
+  
+    # On X86, make sure tail call optimization is off
+    #    The z and y are the tail call optimizations.
+    ifeq ($(ARCH_FAMILY), i586)
+      ifeq ($(shell $(EXPR) $(CC_VER) \> 5.8), 1)
+        # Somehow, tail call optimization is creeping in.
+        #    Make sure it is off.
+	# WARNING: These may cause compiler warnings about duplicate -O options
+        CC_XKEEPFRAME_OPTIONS  += -Wu,-O$(OPT_LEVEL/$(OPTIMIZATION_LEVEL))~yz
+        CXX_XKEEPFRAME_OPTIONS += -Qoption ube -O$(OPT_LEVEL/$(OPTIMIZATION_LEVEL))~yz
+      endif
+    endif
+  
+    #  On i586 we need to tell the code generator to ALWAYS use a
+    #   frame pointer.
+    ifeq ($(ARCH_FAMILY), i586)
+      # Note that in 5.7, this is done with -xregs=no%frameptr
+      ifeq ($(CC_VER), 5.5)
+        # It's not exactly clear when this optimization kicks in, the
+        #   current assumption is -xO4 or greater and for C++ with
+        #   the -features=no%except option and -xO4 and greater.
+        #   Bottom line is, we ALWAYS want a frame pointer!
+        CC_XKEEPFRAME_OPTIONS  += -Wu,-Z~B
+        CXX_XKEEPFRAME_OPTIONS += -Qoption ube -Z~B
+      endif
+      ifeq ($(shell $(EXPR) $(CC_VER) \> 5.6), 1)
+        # Do NOT use frame pointer register as a general purpose opt register
+        CC_OPT/NONE            += -xregs=no%frameptr
+        CXX_OPT/NONE           += -xregs=no%frameptr
+        CC_XKEEPFRAME_OPTIONS  += -xregs=no%frameptr
+        CXX_XKEEPFRAME_OPTIONS += -xregs=no%frameptr
+      endif
+    endif
+  
+    #  Optimizer for sparc needs to be told not to do certain things
+    #   related to frames or save instructions.
+    ifeq ($(ARCH_FAMILY), sparc)
+      #  Do not use save instructions instead of add instructions
+      #  This was an optimization starting in SC5.0 that made it hard for us to
+      #    find the "save" instruction (which got turned into an "add")
+      CC_XKEEPFRAME_OPTIONS  += -Wc,-Qrm-s
+      CXX_XKEEPFRAME_OPTIONS += -Qoption cg -Qrm-s
+      # Don't allow tail call code optimization. Started in SC5.0.
+      #    We don't like code of this form:
+      #	save
+      #	<code>
+      #	call foo
+      #	   restore
+      #   because we can't tell if the method will have a stack frame
+      #   and register windows or not.
+      CC_XKEEPFRAME_OPTIONS  += -Wc,-Qiselect-T0
+      CXX_XKEEPFRAME_OPTIONS += -Qoption cg -Qiselect-T0
+    endif
+  
+  endif
+
+  # Extra options used with HIGHEST
   #
-  # WARNING: Use of _OPT=$(CC_HIGHEST_OPT) in your Makefile needs to be
+  # WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
   #          done with care, there are some assumptions below that need to
   #          be understood about the use of pointers, and IEEE behavior.
   #
   # Use non-standard floating point mode (not IEEE 754)
-  CC_HIGHEST_OPT += -fns
+  CC_HIGHEST_EXTRAS += -fns
   # Do some simplification of floating point arithmetic (not IEEE 754)
-  CC_HIGHEST_OPT += -fsimple
+  CC_HIGHEST_EXTRAS += -fsimple
   # Use single precision floating point with 'float'
-  CC_HIGHEST_OPT += -fsingle
+  CC_HIGHEST_EXTRAS += -fsingle
   # Assume memory references via basic pointer types do not alias
   #   (Source with excessing pointer casting and data access with mixed 
   #    pointer types are not recommended)
-  CC_HIGHEST_OPT += -xalias_level=basic
+  CC_HIGHEST_EXTRAS += -xalias_level=basic
   # Use intrinsic or inline versions for math/std functions
   #   (If you expect perfect errno behavior, do not use this)
-  CC_HIGHEST_OPT += -xbuiltin=%all
+  CC_HIGHEST_EXTRAS += -xbuiltin=%all
   # Loop data dependency optimizations (need -xO3 or higher)
-  CC_HIGHEST_OPT += -xdepend
+  CC_HIGHEST_EXTRAS += -xdepend
   # Pointer parameters to functions do not overlap
   #   (Similar to -xalias_level=basic usage, but less obvious sometimes.
   #    If you pass in multiple pointers to the same data, do not use this)
-  CC_HIGHEST_OPT += -xrestrict
+  CC_HIGHEST_EXTRAS += -xrestrict
   # Inline some library routines
   #   (If you expect perfect errno behavior, do not use this)
-  CC_HIGHEST_OPT += -xlibmil
+  CC_HIGHEST_EXTRAS += -xlibmil
   # Use optimized math routines
   #   (If you expect perfect errno behavior, do not use this)
   #  Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
-  #  CC_HIGHEST_OPT += -xlibmopt
+  #  CC_HIGHEST_EXTRAS += -xlibmopt
   ifeq ($(ARCH_FAMILY), sparc)
     # Assume at most 8byte alignment, raise SIGBUS on error
     ### Presents an ABI issue with customer JNI libs?
-    ####CC_HIGHEST_OPT  += -xmemalign=8s
+    ####CC_HIGHEST_EXTRAS  += -xmemalign=8s
     # Automatic prefetch instructions, explicit prefetch macros
-    CC_HIGHEST_OPT  += -xprefetch=auto,explicit
+    CC_HIGHEST_EXTRAS += -xprefetch=auto,explicit
     # Pick ultra as the chip to optimize to
-    CC_HIGHEST_OPT  += -xchip=ultra
+    CC_HIGHEST_EXTRAS += -xchip=ultra
   endif
   ifeq ($(ARCH), i586)
     # Pick pentium as the chip to optimize to
-    CC_HIGHEST_OPT  += -xchip=pentium
+    CC_HIGHEST_EXTRAS += -xchip=pentium
   endif
   ifdef LIBRARY
     # The Solaris CBE (Common Build Environment) requires that the use
@@ -476,9 +568,6 @@
     CFLAGS_REQUIRED_sparcv9  += -xregs=no%appl
   endif
   ifeq ($(shell $(EXPR) $(CC_VER) \> 5.6), 1)
-    # Do NOT use the frame pointer register as a general purpose opt register
-    CFLAGS_REQUIRED_i586  += -xregs=no%frameptr
-    CFLAGS_REQUIRED_amd64 += -xregs=no%frameptr
     # We MUST allow data alignment of 4 for sparc V8 (32bit)
     #     Presents an ABI issue with customer JNI libs? We must be able to
     #     to handle 4byte aligned objects? (rare occurance, but possible?)
@@ -492,77 +581,28 @@
   # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
   #   (See Rules.gmk) The SS11 -xpch=auto* options appear to be broken.
   AUTOMATIC_PCH_OPTION =
+  
+  # Add in keep frame options
+  CC_OPT/LOWER    += $(CC_XKEEPFRAME_OPTIONS)
+  CC_OPT/HIGHER   += $(CC_XKEEPFRAME_OPTIONS)
+  CC_OPT/HIGHEST  += $(CC_XKEEPFRAME_OPTIONS)
+  CXX_OPT/LOWER   += $(CXX_XKEEPFRAME_OPTIONS)
+  CXX_OPT/HIGHER  += $(CXX_XKEEPFRAME_OPTIONS)
+  CXX_OPT/HIGHEST += $(CXX_XKEEPFRAME_OPTIONS)
+ 
+  # Add in highest optimization settings
+  CC_OPT/HIGHEST  += $(CC_HIGHEST_EXTRAS)
+  CXX_OPT/HIGHEST += $(CC_HIGHEST_EXTRAS)
+  
 endif
-CC_NO_OPT      = 
 
-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off
-ifdef NO_OPTIMIZATIONS
-  CC_HIGHEST_OPT = $(CC_NO_OPT)
-  CC_HIGHER_OPT  = $(CC_NO_OPT)
-  CC_LOWER_OPT   = $(CC_NO_OPT)
-endif
+# Default optimization settings based on level.
+CC_OPT  = $(CC_OPT/$(OPTIMIZATION_LEVEL))
+CXX_OPT = $(CXX_OPT/$(OPTIMIZATION_LEVEL))
 
 # Flags required all the time
 CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
 
-# Add processor specific options for optimizations
-CC_HIGHEST_OPT += $(_OPT_$(ARCH))
-CC_HIGHER_OPT  += $(_OPT_$(ARCH))
-CC_LOWER_OPT   += $(_OPT_$(ARCH))
-
-# Secret compiler optimization options that should be in the above macros
-#    but since they differ in format from C to C++, are added into the C or
-#    C++ specific macros for compiler flags.
-#
-#  On i586 we need to tell the code generator to ALWAYS use a
-#   frame pointer.
-ifeq ($(ARCH_FAMILY), i586)
-  # Note that in 5.7, this is done with -xregs=no%frameptr
-  ifeq ($(CC_VER), 5.5)
-    #       It's not exactly clear when this optimization kicks in, the
-    #       current assumption is -xO4 or greater and for C++ with
-    #       the -features=no%except option and -xO4 and greater.
-    #       Bottom line is, we ALWAYS want a frame pointer!
-    CXXFLAGS_OPT += -Qoption ube -Z~B
-    CFLAGS_OPT   +=          -Wu,-Z~B
-    ifeq ($(FASTDEBUG), true)
-        CXXFLAGS_DBG += -Qoption ube -Z~B
-        CFLAGS_DBG   +=          -Wu,-Z~B
-    endif
-  endif
-endif
-#
-#  Optimizer for sparc needs to be told not to do certain things
-#   related to frames or save instructions.
-ifeq ($(ARCH_FAMILY), sparc)
-  # NOTE: Someday the compilers will provide a high-level option for this.
-  #   Use save instructions instead of add instructions
-  #    This was an optimization starting in SC5.0 that made it hard for us to
-  #    find the "save" instruction (which got turned into an "add")
-  CXXFLAGS_OPT += -Qoption cg -Qrm-s
-  CFLAGS_OPT   +=         -Wc,-Qrm-s
-  ifeq ($(FASTDEBUG), true)
-    CXXFLAGS_DBG += -Qoption cg -Qrm-s
-    CFLAGS_DBG   +=         -Wc,-Qrm-s
-  endif
-  #
-  # NOTE: Someday the compilers will provide a high-level option for this.
-  #   Don't allow tail call code optimization. Started in SC5.0.
-  #    We don't like code of this form:
-  #	save
-  #	<code>
-  #	call foo
-  #	   restore
-  #   because we can't tell if the method will have a stack frame
-  #   and register windows or not.
-  CXXFLAGS_OPT += -Qoption cg -Qiselect-T0
-  CFLAGS_OPT   +=         -Wc,-Qiselect-T0
-  ifeq ($(FASTDEBUG), true)
-    CXXFLAGS_DBG += -Qoption cg -Qiselect-T0
-    CFLAGS_DBG   +=         -Wc,-Qiselect-T0
-  endif
-endif
-
 #
 # Path and option to link against the VM, if you have to.  Note that
 # there are libraries that link against only -ljava, but they do get
--- a/make/common/Defs-windows.gmk	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/common/Defs-windows.gmk	Wed Aug 06 16:43:53 2008 -0700
@@ -84,6 +84,15 @@
 #
 # Default optimization
 #
+
+ifndef OPTIMIZATION_LEVEL
+  ifeq ($(PRODUCT), java)
+    OPTIMIZATION_LEVEL = HIGHER
+  else
+    OPTIMIZATION_LEVEL = LOWER
+  endif
+endif
+
 ifeq ($(CC_VERSION),msvc)
   # Visual Studio .NET 2003 or VS2003 compiler option definitions:
   #   -O1      Favors reduced size over speed (-Og     -Os -Oy -Ob2 -Gs -GF -Gy)
@@ -113,21 +122,28 @@
   # NOTE: With VC6, -Ox, -O1, and -O2 used -Ob1, not -Ob2.
   # NOTE: With VC6, -O1 and -O2 used -Gf, not -GF.
   #
+
+  CC_OPT/NONE    = -Od
+  CC_OPT/LOWER   = -O2
+  CC_OPT/HIGHER  = -O3
+  CC_OPT/HIGHEST = -O3
+  
   ifeq ($(COMPILER_VERSION), VC6)
     # VC6 (6.2) msvc compiler (the way Tiger and early Mustang were built)
     # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
     AUTOMATIC_PCH_OPTION =
     GX_OPTION = -GX
     ifeq ($(ARCH_DATA_MODEL), 32)
-      CC_HIGHEST_OPT = -Ox -Gy -Os -GB
-      CC_HIGHER_OPT  = -Ox -Gy -Os -GB
-      CC_LOWER_OPT   = -Ox -Gy -Os -GB
+      CC_OPT/HIGHEST = -Ox -Gy -Os -GB
+      CC_OPT/HIGHER  = -Ox -Gy -Os -GB
+      CC_OPT/LOWER   = -Ox -Gy -Os -GB
     else
-      CC_HIGHEST_OPT = -Ox -Gy -Op
-      CC_HIGHER_OPT  = -Ox -Gy -Op
-      CC_LOWER_OPT   = -Ox -Gy -Op
+      CC_OPT/HIGHEST = -Ox -Gy -Op
+      CC_OPT/HIGHER  = -Ox -Gy -Op
+      CC_OPT/LOWER   = -Ox -Gy -Op
     endif
   endif
+  
   ifeq ($(COMPILER_VERSION), VS2003)
     # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
     AUTOMATIC_PCH_OPTION = -YX
@@ -135,53 +151,45 @@
     GX_OPTION = -GX
     ifeq ($(ARCH_DATA_MODEL), 32)
       # Lowered opt level to try and reduce footprint, dll size especially.
-      #     Was: CC_HIGHEST_OPT = -O2 -G6
-      #     Was: CC_HIGHER_OPT  = -O2
-      CC_HIGHEST_OPT = -O2
-      CC_HIGHER_OPT  = -O1
-      CC_LOWER_OPT   = -O1
+      #     Was: CC_OPT/HIGHEST = -O2 -G6
+      #     Was: CC_OPT/HIGHER  = -O2
+      CC_OPT/HIGHEST = -O2
+      CC_OPT/HIGHER  = -O1
+      CC_OPT/LOWER   = -O1
     else
-      CC_HIGHEST_OPT = -O2 -Op
-      CC_HIGHER_OPT  = -O2 -Op
-      CC_LOWER_OPT   = -O1 -Op
+      CC_OPT/HIGHEST = -O2 -Op
+      CC_OPT/HIGHER  = -O2 -Op
+      CC_OPT/LOWER   = -O1 -Op
     endif
   endif
+  
   ifeq ($(COMPILER_VERSION), VS2005)
     # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
     AUTOMATIC_PCH_OPTION =
     # VS2005 compiler, only with Platform SDK right now?
     GX_OPTION = -EHsc
     ifeq ($(ARCH_DATA_MODEL), 32)
-      CC_HIGHEST_OPT = -O2
-      CC_HIGHER_OPT  = -O1
-      CC_LOWER_OPT   = -O1
+      CC_OPT/HIGHEST = -O2
+      CC_OPT/HIGHER  = -O1
+      CC_OPT/LOWER   = -O1
     else
-      CC_HIGHEST_OPT = -O2
-      CC_HIGHER_OPT  = -O1
-      CC_LOWER_OPT   = -O1
+      CC_OPT/HIGHEST = -O2
+      CC_OPT/HIGHER  = -O1
+      CC_OPT/LOWER   = -O1
     endif
   endif
-  CC_NO_OPT      = -Od
+
 else # CC_VERSION
+  
   # GCC not supported, but left for historical reference...
-  CC_HIGHEST_OPT = -O3
-  CC_HIGHER_OPT  = -O2
-  CC_LOWER_OPT   = -O2
-  CC_NO_OPT      = 
+  CC_OPT/NONE     =
+  CC_OPT/LOWER    = -O2
+  CC_OPT/HIGHER   = -O2
+  CC_OPT/HIGHEST  = -O3
+
 endif
 
-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off
-ifdef NO_OPTIMIZATIONS
-  CC_HIGHEST_OPT = $(CC_NO_OPT)
-  CC_HIGHER_OPT  = $(CC_NO_OPT)
-  CC_LOWER_OPT   = $(CC_NO_OPT)
-endif
-
-ifeq ($(PRODUCT), java)
-    _OPT = $(CC_HIGHER_OPT)
-else
-    _OPT = $(CC_LOWER_OPT)
-endif
+CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
 
 # Select the runtime support library carefully, need to be consistent
 #
@@ -233,7 +241,7 @@
   #            Use static link for the C++ runtime (so msvcp71.dll not needed)
   #   
   CFLAGS_COMMON  += -Zi -nologo
-  CFLAGS_OPT      = $(POPT)
+  CFLAGS_OPT      = $(CC_OPT)
   CFLAGS_DBG      = -Od $(MS_RUNTIME_DEBUG_OPTION)
 
   # Starting from VS2005 the wchar_t is handled as a built-in C/C++ data type
--- a/make/common/Defs.gmk	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/common/Defs.gmk	Wed Aug 06 16:43:53 2008 -0700
@@ -483,11 +483,6 @@
 include $(JDK_MAKE_SHARED_DIR)/Defs-java.gmk
 
 #
-# Set opt level to ALT_OPT if set otherwise _OPT
-#
-POPT = $(_OPT$(ALT_OPT))$(ALT_OPT)
-
-#
 # Convenient macros
 #
 
--- a/make/common/Library.gmk	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/common/Library.gmk	Wed Aug 06 16:43:53 2008 -0700
@@ -238,7 +238,7 @@
 #
 $(ACTUAL_LIBRARY):: $(COMPILE_FILES_o) $(FILES_m) $(FILES_reorder)
 	@$(prep-target)
-	@$(ECHO) "STATS: LIBRARY=$(LIBRARY), PRODUCT=$(PRODUCT), _OPT=$(_OPT)"
+	@$(ECHO) "STATS: LIBRARY=$(LIBRARY), PRODUCT=$(PRODUCT), OPTIMIZATION_LEVEL=$(OPTIMIZATION_LEVEL)"
 	@$(ECHO) "Rebuilding $@ because of $?"
 ifeq ($(LIBRARY), fdlibm)
 	$(AR) -r $@ $(FILES_o)
--- a/make/common/shared/Compiler-sun.gmk	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/common/shared/Compiler-sun.gmk	Wed Aug 06 16:43:53 2008 -0700
@@ -31,11 +31,8 @@
 
 # Sun Studio Compiler settings specific to Solaris
 ifeq ($(PLATFORM), solaris)
-  # FIXUP: Change to SS12 when validated
-  #COMPILER_VERSION=SS12
-  #REQUIRED_CC_VER=5.9
-  COMPILER_VERSION=SS11
-  REQUIRED_CC_VER=5.8
+  COMPILER_VERSION=SS12
+  REQUIRED_CC_VER=5.9
   CC             = $(COMPILER_PATH)cc
   CPP            = $(COMPILER_PATH)cc -E
   CXX            = $(COMPILER_PATH)CC
--- a/make/common/shared/Defs.gmk	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/common/shared/Defs.gmk	Wed Aug 06 16:43:53 2008 -0700
@@ -279,9 +279,6 @@
 PROMOTED_BUILD_BASEDIR = $(PROMOTED_RE_AREA)/$(PROMOTED_BUILD_LATEST)
 PROMOTED_BUILD_BINARIES = $(PROMOTED_BUILD_BASEDIR)/binaries
 
-# OPT: Changes what the optimizations settings (in _OPT)
-POPT = $(_OPT$(ALT_OPT))$(ALT_OPT)
-
 # PARALLEL_COMPILE_JOBS: is the number of compiles done in parallel.
 #  If the user sets ALT_PARALLEL_COMPILE_JOBS, then COMPILE_APPROACH is set
 #  to parallel.
--- a/make/java/fdlibm/Makefile	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/java/fdlibm/Makefile	Wed Aug 06 16:43:53 2008 -0700
@@ -33,6 +33,7 @@
 BUILDDIR     = ../..
 LIBRARY      = fdlibm
 PRODUCT      = java
+
 include $(BUILDDIR)/common/Defs.gmk
 
 #
@@ -40,15 +41,24 @@
 #
 FDLIBM_SRC = $(SHARE_SRC)/native/java/lang/fdlibm
 
-# windows compiler flags
+# Windows: compiler flags
 ifeq ($(PLATFORM),windows)
   # Turn all optimizations off
-  _OPT = $(CC_NO_OPT)
+  OPTIMIZATION_LEVEL = NONE
   OTHER_CFLAGS =
   CPPFLAGS_DBG += -DLOGGING
 endif
 
 #
+# Linux: Disable optimization to get correctly reproducible
+# floating-point results.
+#
+ifeq ($(PLATFORM),linux)
+  # Turn all optimizations off
+  OPTIMIZATION_LEVEL = NONE
+endif
+
+#
 # Include path.
 #
 OTHER_INCLUDES = -I$(FDLIBM_SRC)/include
@@ -69,15 +79,6 @@
 include $(BUILDDIR)/common/Library.gmk
 
 #
-# Disable optimization to get correctly reproducible 
-# floating-point results.
-#
-ifeq ($(PLATFORM),linux)
-  # Turn all optimizations off
-  _OPT = $(CC_NO_OPT)
-endif
-
-#
 # Find fdlibm source files.
 #
 vpath %.c
--- a/make/java/java_hprof_demo/Makefile	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/java/java_hprof_demo/Makefile	Wed Aug 06 16:43:53 2008 -0700
@@ -28,14 +28,14 @@
 PRODUCT = sun
 LIBRARY_OUTPUT = hprof_jvmti
 
+# Use highest optimization
+OPTIMIZATION_LEVEL = HIGHEST
+
 # Configure the CFLAGS for this library.
-
 FILES_m = mapfile-vers
 
 include $(BUILDDIR)/common/Defs.gmk
 
-_OPT=$(CC_HIGHEST_OPT)
-
 SRCDIR=$(SHARE_SRC)/demo/jvmti/hprof
 PSRCDIR=$(PLATFORM_SRC)/demo/jvmti/hprof
 
--- a/make/jprt.config	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/jprt.config	Wed Aug 06 16:43:53 2008 -0700
@@ -137,9 +137,7 @@
     if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
         compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
     else
-        # FIXUP: Change to SS12 when validated
-	#compiler_name=SS12
-	compiler_name=SS11
+	compiler_name=SS12
     fi
     compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
     ALT_COMPILER_PATH="${compiler_path}"
--- a/make/sun/awt/Makefile	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/sun/awt/Makefile	Wed Aug 06 16:43:53 2008 -0700
@@ -28,18 +28,14 @@
 LIBRARY = awt
 PRODUCT = sun
 
-#
 # Tell Defs.gmk that VIS is needed
-#
 VIS_NEEDED=true
 
+# Use highest optimization level
+OPTMIZATION_LEVEL = HIGHEST
+
 include $(BUILDDIR)/common/Defs.gmk
 
-#
-# Use highest optimization level
-#
-_OPT = $(CC_HIGHEST_OPT)
-
 OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES
 
 #
--- a/make/sun/font/Makefile	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/sun/font/Makefile	Wed Aug 06 16:43:53 2008 -0700
@@ -35,6 +35,9 @@
 # Indicate we want the C++ compiler to do the linking.
 CPLUSPLUSLIBRARY=true
 
+# Use higher optimization level
+OPTIMIZATION_LEVEL = HIGHER
+
 include $(BUILDDIR)/common/Defs.gmk
 
 #
@@ -48,11 +51,6 @@
 # Files
 #
 
-#
-# Use higher optimization level
-#
-_OPT = $(CC_HIGHER_OPT)
-
 include FILES_c.gmk
 
 AUTO_FILES_JAVA_DIRS = sun/font
--- a/make/sun/font/t2k/Makefile	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/sun/font/t2k/Makefile	Wed Aug 06 16:43:53 2008 -0700
@@ -41,14 +41,12 @@
 # for a few ones with native methods) so shouldn't clobber them.
 DONT_CLOBBER_CLASSES=true
 
+# Use higher optimization level
+OPTIMIZATION_LEVEL = HIGHER
+
 include $(BUILDDIR)/common/Defs.gmk
 
 #
-# Use higher optimization level
-#
-_OPT = $(CC_HIGHER_OPT)
-
-#
 # Files
 #
 include FILES_c.gmk
--- a/make/sun/image/generic/Makefile	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/sun/image/generic/Makefile	Wed Aug 06 16:43:53 2008 -0700
@@ -31,14 +31,13 @@
 PACKAGE = sun.awt.medialib
 LIBRARY = mlib_image
 PRODUCT = sun
+
+# Use highest level of optimization on this library
+OPTIMIZATION_LEVEL = HIGHEST
+
 include $(BUILDDIR)/common/Defs.gmk
 
 #
-# Use highest level of optimization on this library
-#
-_OPT = $(CC_HIGHEST_OPT)
-
-#
 # Use mapfile
 #
 FILES_m = mapfile-vers
--- a/make/sun/image/vis/Makefile	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/sun/image/vis/Makefile	Wed Aug 06 16:43:53 2008 -0700
@@ -31,19 +31,15 @@
 LIBRARY = mlib_image_v
 PRODUCT = sun
 
-#
 # Tell Defs.gmk we need VIS instructions
-#
 VIS_NEEDED=true
 
+# Select highest level of optimization for this library
+OPTIMIZATION_LEVEL = HIGHEST
+
 include $(BUILDDIR)/common/Defs.gmk
 
 #
-# Select highest level of optimization for this library
-#
-_OPT = $(CC_HIGHEST_OPT)
-
-#
 # Use generic mapfile
 #
 FILES_m = ../generic/mapfile-vers
--- a/make/sun/jpeg/Makefile	Wed Aug 06 15:02:15 2008 -0700
+++ b/make/sun/jpeg/Makefile	Wed Aug 06 16:43:53 2008 -0700
@@ -27,14 +27,13 @@
 PACKAGE = sun.awt
 LIBRARY = jpeg
 PRODUCT = sun
+
+# Use highest optimization level
+OPTIMIZATION_LEVEL = HIGHEST
+
 include $(BUILDDIR)/common/Defs.gmk
 
 #
-# Use highest optimization level
-#
-_OPT = $(CC_HIGHEST_OPT)
-
-#
 # Files
 #
 include FILES_c.gmk