# HG changeset patch
# User tbell
# Date 1257149012 28800
# Node ID 517d870f8e237f2c3ab71bf6a066c71aa14eabec
# Parent  1dbde02e3c37ffc866ba8705ba9626653ad5f007# Parent  ccac5c36a11cb160a425c541757f40d0e3f54a53
Merge

diff -r 1dbde02e3c37 -r 517d870f8e23 README-builds.html
--- a/README-builds.html	Fri Oct 30 10:54:25 2009 -0700
+++ b/README-builds.html	Mon Nov 02 00:03:32 2009 -0800
@@ -545,7 +545,11 @@
                 </li>
                 <li>
                     <strong>Windows:</strong>
-                    Make sure you start your build inside a bash/sh/ksh shell.
+                    Make sure you start your build inside a bash/sh/ksh shell
+                    and are using a <tt>make.exe</tt> utility built for that
+                    environment (a cygwin <tt>make.exe</tt> is not the same
+                    as a <tt>make.exe</tt> built for something like
+                    <a href="http://www.mkssoftware.com/">MKS</a>). 
                     <br>
                     <b>WARNING:</b> Watch out for make version 3.81, it may
                     not work due to a lack of support for MS-DOS drive letter paths
@@ -826,7 +830,8 @@
                 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" target="_blank">JDK 6 download site</a>.
+                <a href="http://java.sun.com/javase/downloads/index.jsp"
+		target="_blank">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.
diff -r 1dbde02e3c37 -r 517d870f8e23 make/hotspot-rules.gmk
--- a/make/hotspot-rules.gmk	Fri Oct 30 10:54:25 2009 -0700
+++ b/make/hotspot-rules.gmk	Mon Nov 02 00:03:32 2009 -0800
@@ -72,6 +72,10 @@
   HOTSPOT_TARGET = all_fastdebug
 endif
 
+ifeq ($(ZERO_BUILD), true)
+  HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
+endif
+
 HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
 HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
 HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)