--- a/ChangeLog	Wed Oct 15 03:50:28 2014 +0100
+++ b/ChangeLog	Wed Oct 15 04:09:18 2014 +0100
@@ -1,3 +1,24 @@
+2014-10-14  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(TAR_SUFFIX): New variable to store filename
+	suffix of OpenJDK drop tarballs.
+	(OPENJDK_SRC_ZIP): Use TAR_SUFFIX.
+	(CORBA_SRC_ZIP): Likewise.
+	(JAXP_SRC_ZIP): Likewise.
+	(JAXWS_SRC_ZIP): Likewise.
+	(JDK_SRC_ZIP): Likewise.
+	(LANGTOOLS_SRC_ZIP): Likewise.
+	(HOTSPOT_SRC_ZIP): Likewise.
+	(download-hotspot): Look for $(HSBUILD).$(TAR_SUFFIX)
+	as the drop tarball filename in the URL if using
+	a non-default HotSpot, rather than always looking
+	for hotspot.$(TAR_SUFFIX).
+	(ADD_ZERO_CONFIGURE_ARGS): Make use of $(TAR_SUFFIX).
+	* NEWS: Updated.
+	* hotspot.map.in:
+	Use same drop path for aarch64 as for default.
+
 2013-01-23  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	CA172, PR2030, G453612: Add ARM hardfloat support

--- a/Makefile.am	Wed Oct 15 03:50:28 2014 +0100
+++ b/Makefile.am	Wed Oct 15 04:09:18 2014 +0100
@@ -137,6 +137,7 @@
 
 # Conditional defintions
 
+TAR_SUFFIX = tar.bz2
 if USE_HG
   OPENJDK_SRC_ZIP = 
   CORBA_SRC_ZIP =
@@ -146,13 +147,13 @@
   LANGTOOLS_SRC_ZIP =
   HOTSPOT_SRC_ZIP =
 else
-  OPENJDK_SRC_ZIP = openjdk.tar.bz2
-  CORBA_SRC_ZIP = corba.tar.bz2
-  JAXP_SRC_ZIP = jaxp.tar.bz2
-  JAXWS_SRC_ZIP = jaxws.tar.bz2
-  JDK_SRC_ZIP = jdk.tar.bz2
-  LANGTOOLS_SRC_ZIP = langtools.tar.bz2
-  HOTSPOT_SRC_ZIP = hotspot.tar.bz2
+  OPENJDK_SRC_ZIP = openjdk.$(TAR_SUFFIX)
+  CORBA_SRC_ZIP = corba.$(TAR_SUFFIX)
+  JAXP_SRC_ZIP = jaxp.$(TAR_SUFFIX)
+  JAXWS_SRC_ZIP = jaxws.$(TAR_SUFFIX)
+  JDK_SRC_ZIP = jdk.$(TAR_SUFFIX)
+  LANGTOOLS_SRC_ZIP = langtools.$(TAR_SUFFIX)
+  HOTSPOT_SRC_ZIP = hotspot.$(TAR_SUFFIX)
 endif
 
 if WITH_HGREV
@@ -1102,7 +1103,11 @@
 	    if test "x$(HS_TYPE)" = "xhg"; then \
 	      $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
 	    else \
-	      $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \
+		if test "x$(HSBUILD)" = "xdefault"; then \
+	          $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \
+		else \
+		  $(WGET) $(HS_URL)/$(HSBUILD).$(TAR_SUFFIX) -O $(HOTSPOT_SRC_ZIP) ; \
+		fi ; \
             fi ; \
 	    if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
@@ -2266,7 +2271,7 @@
 			'--disable-bootstrap% '--enable-bootstrap% , \
 		$(CONFIGURE_ARGS)) \
 	$(foreach i, openjdk hotspot corba jaxp jaxws jdk langtools, \
-	  $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.bz2))
+	  $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).$(TAR_SUFFIX)))
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
 	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \

--- a/NEWS	Wed Oct 15 03:50:28 2014 +0100
+++ b/NEWS	Wed Oct 15 04:09:18 2014 +0100
@@ -62,6 +62,7 @@
   - PR2002: Fix references to hotspot.map following PR2000
   - PR2003: --disable-system-gtk option broken by refactoring in PR1736
   - PR2009: Checksum of policy JAR files changes on every build
+  - PR2014: Use version from hotspot.map to create tarball filename
   - PR2025: LCMS_CFLAGS & LCMS_LIBS should not be used unless SYSTEM_LCMS is enabled
   - RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised comprehensive fix)
 * CACAO

--- a/hotspot.map.in	Wed Oct 15 03:50:28 2014 +0100
+++ b/hotspot.map.in	Wed Oct 15 04:09:18 2014 +0100
@@ -1,3 +1,3 @@
 # version type(drop/hg) url changeset sha256sum
 default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1d0d98e7c981 8c8e1f7e97f47fe4029e0b0ba42b3515474adabe64e1fbee15c0e2e22a13aa28
-aarch64 drop http://icedtea.classpath.org/download/drops/aarch64/@ICEDTEA_RELEASE@ 116bc9da35de b9e7f67079184310450c9b461b492f340aa7824c27079b430c8f25b58b327ec5
+aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 116bc9da35de b9e7f67079184310450c9b461b492f340aa7824c27079b430c8f25b58b327ec5