changeset 2986:d5ea2fe9da2d

Use latest hs23 HEAD, bringing in security fixes and aarch64 patch. 2013-04-25 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am: (ICEDTEA_PATCHES): Move aarch64.patch to original HotSpot only. * hotspot.map: Sync with latest hs23 HEAD.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Thu, 25 Apr 2013 18:18:04 +0100
parents 0396c602f40d
children c9be0d1330dc
files ChangeLog Makefile.am hotspot.map
diffstat 3 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Apr 25 15:04:12 2013 +0100
+++ b/ChangeLog	Thu Apr 25 18:18:04 2013 +0100
@@ -1,3 +1,10 @@
+2013-04-25  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Move aarch64.patch to original
+	HotSpot only.
+	* hotspot.map: Sync with latest hs23 HEAD.
+
 2013-04-12  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* Makefile.am:
--- a/Makefile.am	Thu Apr 25 15:04:12 2013 +0100
+++ b/Makefile.am	Thu Apr 25 18:18:04 2013 +0100
@@ -559,12 +559,10 @@
 	patches/hotspot/original/7197906-handle_32_bit_shifts.patch \
 	patches/hotspot/original/fix_get_stack_bounds_leak.patch \
 	patches/hotspot/original/jvmtiEnv.patch \
-	patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch
+	patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \
+	patches/aarch64.patch
 endif
 
-# Needs to be after the addition of SH support to the original HotSpot
-ICEDTEA_PATCHES += patches/aarch64.patch
-
 if WITH_RHINO
 ICEDTEA_PATCHES += \
 	patches/rhino.patch
--- a/hotspot.map	Thu Apr 25 15:04:12 2013 +0100
+++ b/hotspot.map	Thu Apr 25 18:18:04 2013 +0100
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 23888f3dec52 6d77e26134d47e62621a35b259c70d8e98070724af9a718ec2b85cf84b954614
+hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 332f7e24a493 da6f849e2b8c0e8c46de4171b9f14ec9d97bac76dd56006d9c33323b23f54f98