# HG changeset patch
# User duke
# Date 1499266961 -7200
# Node ID 8efdeb032438592b367d2bd355f78b98b3f8da3c
# Parent  02d36709a16f490dd6f634ba22a1db5d15206dbf# Parent  ef0a6062eaecba0882aa3191006b2551bebedfee
Merge

diff -r 02d36709a16f -r 8efdeb032438 .hgtags-top-repo
--- a/.hgtags-top-repo	Fri Nov 06 00:41:40 2009 -0800
+++ b/.hgtags-top-repo	Wed Jul 05 17:02:41 2017 +0200
@@ -49,3 +49,4 @@
 0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72
 3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73
 2c88089b6e1c053597418099a14232182c387edc jdk7-b74
+d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
diff -r 02d36709a16f -r 8efdeb032438 README-builds.html
--- a/README-builds.html	Fri Nov 06 00:41:40 2009 -0800
+++ b/README-builds.html	Wed Jul 05 17:02:41 2017 +0200
@@ -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 02d36709a16f -r 8efdeb032438 make/hotspot-rules.gmk
--- a/make/hotspot-rules.gmk	Fri Nov 06 00:41:40 2009 -0800
+++ b/make/hotspot-rules.gmk	Wed Jul 05 17:02:41 2017 +0200
@@ -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)