--- a/ChangeLog	Wed Oct 15 04:09:18 2014 +0100
+++ b/ChangeLog	Wed Oct 15 04:34:18 2014 +0100
@@ -1,3 +1,12 @@
+2014-10-14  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* INSTALL: Update section on hotspot.map
+	to reflect recent changes.
+	* Makefile.am:
+	(download-hotspot): Use $(TAR_SUFFIX) in hg drops
+	as well.
+	* NEWS: Updated.
+
 2014-10-14  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* Makefile.am:

--- a/INSTALL	Wed Oct 15 04:09:18 2014 +0100
+++ b/INSTALL	Wed Oct 15 04:34:18 2014 +0100
@@ -306,35 +306,61 @@
 
 IcedTea allows the version of HotSpot provided with the upstream build
 drop to be replaced with another.  Support for this is provided by the
---with-hotspot-build option which causes IcedTea to probe the
-hotspot.map file for an entry with the given build name.  The
-hotspot.map file maps the name to a changeset from a given repository
-URL.  During the build, it downloads HotSpot from
-${URL}/archive/${CHANGESET}.tar.gz and the resulting file is verified
-using the MD5 sum stored in hotspot.map.
+--with-hotspot-build=${name} option which causes IcedTea to probe the
+hotspot.map file for an entry with the given build name. The map file
+always contains an entry named 'default' which corresponds to the
+upstream build drop. Specifying --without-hotspot-build will ensure
+that 'default' is used.
+
+At build time, the hotspot.map file is used as follows:
+
+1. The type of tarball (Mercurial changeset or drop), URL, changeset
+ID and SHA256 checksum corresponding to the HotSpot build being used
+are obtained from the hotspot.map file.
+2. When the download-hotspot target is invoked, the URL used is
+constructed using the contents of hotspot.map. If the type is 'hg',
+then the tarball is downloaded from
+${URL}/archive/${CHANGESET}.${TAR_SUFFIX}, where ${URL} and ${CHANGESET}
+are taken from hotspot.map and ${TAR_SUFFIX} is the suffix used in the
+filename to specify the type of compression being used (e.g. tar.gz or
+tar.bz2). If the type is 'drop', then the tarball is downloaded from
+${URL}/${HSNAME}.${TAR_SUFFIX}, where ${HSNAME} is the name of the
+HotSpot build being used. In the case of 'default', ${HSNAME} is set
+to 'hotspot'. Once the file is downloaded, it is verified using
+the SHA256 checksum from the hotspot.map file.
+3. When the extract-hotspot target is invoked, the name of the
+top-level directory from the tarball is constructed using the
+${CHANGESET} field from hotspot.map i.e. the tarball should contain
+a top-level directory called hotspot-${CHANGESET}.
 
 New build selections may be provided by providing further mappings in
-the hotspot.map file.  The name can be anything
+the hotspot.map.in file.  The name can be anything
 e.g. 'shiny_new_hotspot'.  This is simply used to map the argument to
 --with-hotspot-build to the values in the file and to apply
 appropriate patches (see patches/hotspot, $HSBUILD is available in
-Makefile.am for obtaining the build name).  The special value
-'original' is used for patches/hotspot/original to denote those for
-the upstream HotSpot; this value does not appear in hotspot.map.  
+Makefile.am for obtaining the build name).
 
-The changeset and URL should refer to a valid HotSpot tree when used
-as above.  The required values can be obtained from a local checkout
-or by using the web interface.  The simplest way to calculate the MD5
-sum is to download the tarball and then run the 'md5sum' application
-on it.  The resulting value should be added to hotspot.map.
+The required values for the changeset field can be obtained from a
+local checkout or by using the web interface.  The simplest way to
+calculate the SHA256 sum is to download the tarball and then run the
+'sha256sum' application on it.  The resulting value should be added to
+hotspot.map.in.
+
+Note that the source tree contains hotspot.map.in, but hotspot.map is
+used at build-time. The latter is generated by configure and this
+generation process may be used to include information determined
+by configure. In the case of the existing hotspot.map.in entries,
+this is used to include the IcedTea release version in the URL.
 
 As with the OpenJDK build tarballs, the location of an alternate zip
 can be specified using --with-hotspot-src-zip.  This skips the
-download stage and just verifies that the zip's MD5 sum matches that
+download stage and just verifies that the zip's SHA256 sum matches that
 of the requested build.
 
-Currently, IcedTea7 only supports the 'original' HotSpot provided as
-part of the upstream IcedTea forest.
+Currently, IcedTea 2.x supports the 'default' HotSpot tree, which is
+part of the IcedTea forest for the particular minor release series
+being used, and 'aarch64', which uses snapshots of the AArch64 HotSpot
+port available at http://hg.openjdk.java.net/aarch64-port/jdk7u
 
 JavaScript Support
 ==================

--- a/Makefile.am	Wed Oct 15 04:09:18 2014 +0100
+++ b/Makefile.am	Wed Oct 15 04:34:18 2014 +0100
@@ -1101,7 +1101,7 @@
 	      mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
 	    fi ; \
 	    if test "x$(HS_TYPE)" = "xhg"; then \
-	      $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
+	      $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).$(TAR_SUFFIX) -O $(HOTSPOT_SRC_ZIP) ; \
 	    else \
 		if test "x$(HSBUILD)" = "xdefault"; then \
 	          $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \

--- a/NEWS	Wed Oct 15 04:09:18 2014 +0100
+++ b/NEWS	Wed Oct 15 04:34:18 2014 +0100
@@ -63,6 +63,7 @@
   - 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
+  - PR2015: Update hotspot.map documentation in INSTALL
   - 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