--- a/ChangeLog	Fri Feb 08 13:00:04 2013 +0000
+++ b/ChangeLog	Fri Feb 08 13:31:03 2013 +0000
@@ -1,3 +1,11 @@
+2013-02-08  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	PR1301: PR1171 causes Zero builds to fail
+	(add-archive): Don't run -Xshare:dump if building
+	Zero.
+	(add-archive-debug): Likewise.
+	(add-archive-ecj): Likewise.
+
 2013-02-08  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR1297: cacao and jamvm parallel unpack failures

--- a/Makefile.am	Fri Feb 08 13:00:04 2013 +0000
+++ b/Makefile.am	Fri Feb 08 13:31:03 2013 +0000
@@ -1868,11 +1868,13 @@
 stamps/add-archive.stamp: stamps/icedtea.stamp
 if !ENABLE_JAMVM
 if !ENABLE_CACAO
+if !ZERO_BUILD
 	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
 	fi
 endif
 endif
+endif
 	touch stamps/add-archive.stamp
 
 clean-add-archive:
@@ -1882,11 +1884,13 @@
 stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
 if !ENABLE_JAMVM
 if !ENABLE_CACAO
+if !ZERO_BUILD
 	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
 	fi
 endif
 endif
+endif
 	touch stamps/add-archive-debug.stamp
 
 clean-add-archive-debug:
@@ -2063,11 +2067,13 @@
 stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp
 if !ENABLE_JAMVM
 if !ENABLE_CACAO
+if !ZERO_BUILD
 	if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
 	  $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
 	fi
 endif
 endif
+endif
 	touch stamps/add-archive-ecj.stamp
 
 clean-add-archive-ecj:

--- a/NEWS	Fri Feb 08 13:00:04 2013 +0000
+++ b/NEWS	Fri Feb 08 13:31:03 2013 +0000
@@ -17,6 +17,7 @@
   - S8005615: Java Logger fails to load tomcat logger implementation (JULI)
 * Bug fixes
   - PR1297: cacao and jamvm parallel unpack failures
+  - PR1301: PR1171 causes builds of Zero to fail
 
 New in release 1.12.1 (2013-02-04):