# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1350460291 -3600
# Node ID e0645102f9be06f1d691c4d9033c1b8684b2ad1e
# Parent  5be85097f377ce576d8f1561b7bf6085f9844492
S7158800: Improve storage of symbol tables

2011-10-17  Andrew John Hughes  <gnu.andrew@redhat.com>

	* Makefile.am:
	(HOTSPOT_CHANGESET): Update to bring in
	S7158800.
	(HOTSPOT_SHA256SUM): Likewise.
	* NEWS: Move S7158800 to backports now it's
	actually included...

diff -r 5be85097f377 -r e0645102f9be ChangeLog
--- a/ChangeLog	Wed Oct 17 07:20:42 2012 +0100
+++ b/ChangeLog	Wed Oct 17 08:51:31 2012 +0100
@@ -1,3 +1,12 @@
+2011-10-17  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* Makefile.am:
+	(HOTSPOT_CHANGESET): Update to bring in
+	S7158800.
+	(HOTSPOT_SHA256SUM): Likewise.
+	* NEWS: Move S7158800 to backports now it's
+	actually included...
+
 2011-10-17  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* configure.ac: Bump to 2.2.3 proper.
diff -r 5be85097f377 -r e0645102f9be Makefile.am
--- a/Makefile.am	Wed Oct 17 07:20:42 2012 +0100
+++ b/Makefile.am	Wed Oct 17 08:51:31 2012 +0100
@@ -5,7 +5,7 @@
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
 CORBA_CHANGESET = 12fee4f9ac22
-HOTSPOT_CHANGESET = 864418cd5667
+HOTSPOT_CHANGESET = 1a3dc05d59c2
 JAXP_CHANGESET = dc64245ac19d
 JAXWS_CHANGESET = b41293d57940
 JDK_CHANGESET = 4cf358fd012a
@@ -13,7 +13,7 @@
 OPENJDK_CHANGESET = 32574ae3c2be
 
 CORBA_SHA256SUM = bf314ffe9993f70ef9a0449b5c540883935b6326e28ee5afdc44f062039e0303
-HOTSPOT_SHA256SUM = 85b0ff446da7f05cd8e2f6902d86fcb109b347db858791e3afcf315ce5ef2942
+HOTSPOT_SHA256SUM = 7a54b49cfd6ae6a4cc8aaba042f96e1622cf88f6ba0ffc61bbc36cc164a5d096
 JAXP_SHA256SUM = 5003576ed427cae1dda7ccf7c1af042ea8f62ad668e176583a84fba989f77e32
 JAXWS_SHA256SUM = a3bf4ec265fd044a5abce35dfc51b1977826a21bd13abe05a8336f25e8a8dd21
 JDK_SHA256SUM = 5cd45b036269d35ec916e0b99977a87d2a2addefe9aa2058fbc05d0269cd9008
diff -r 5be85097f377 -r e0645102f9be NEWS
--- a/NEWS	Wed Oct 17 07:20:42 2012 +0100
+++ b/NEWS	Wed Oct 17 08:51:31 2012 +0100
@@ -35,13 +35,13 @@
   - S7195919, CVE-2012-5979: (sl) ServiceLoader can throw CCE without needing to create instance
   - S7196190, CVE-2012-5088: Improve method of handling MethodHandles
   - S7198296, CVE-2012-5089: Refactor classloader usage
-  - S7158800: Improve storage of symbol tables
   - S7158801: Improve VM CompileOnly option
   - S7158804: Improve config file parsing
   - S7198606, CVE-2012-4416: Improve VM optimization
 * Backports
   - S7175845: "jar uf" changes file permissions unexpectedly
   - S7177216: native2ascii changes file permissions of input file
+  - S7158800: Improve storage of symbol tables
 * Bug fixes
   - Remove merge artefact.
   - Remove the Xp header and library checks.