Mercurial > hg > release > icedtea7-2.5

changeset 2731:47947856cc3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update aarch64 port to jdk7u60_b04_aarch64_832 2014-06-13 Andrew John Hughes <gnu.andrew@member.fsf.org> Update aarch64 port to jdk7u60_b04_aarch64_832 * Makefile.am: (ICEDTEA_PATCHES): Add back systemtap_gc patch just for aarch64. Now included in default tree. * hotspot.map: Bump aarch64 port and switch to drop as with default.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 13 Jun 2014 23:03:30 +0100
parents 86ec9bccfca9
children 15b1fc0169cc
files ChangeLog Makefile.am hotspot.map
diffstat 3 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 13 20:23:50 2014 +0100
+++ b/ChangeLog	Fri Jun 13 23:03:30 2014 +0100
@@ -1,3 +1,12 @@
+2014-06-13  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	Update aarch64 port to jdk7u60_b04_aarch64_832
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add back systemtap_gc patch
+	just for aarch64. Now included in default tree.
+	* hotspot.map:
+	Bump aarch64 port and switch to drop as with default.
+
 2014-06-13  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* configure.ac: Set to 2.5.0.
--- a/Makefile.am	Fri Jun 13 20:23:50 2014 +0100
+++ b/Makefile.am	Fri Jun 13 23:03:30 2014 +0100
@@ -266,11 +266,6 @@
 	patches/cacao/ignore-tests.patch
 endif
 
-if ENABLE_SYSTEMTAP
-#ICEDTEA_PATCHES += \
-#	patches/hotspot/$(HSBUILD)/systemtap_gc.patch
-endif
-
 if ENABLE_NSS
 ICEDTEA_PATCHES += patches/nss-config.patch \
 	patches/rh1022017.patch
@@ -284,6 +279,10 @@
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += patches/hotspot/aarch64/werror.patch
+if ENABLE_SYSTEMTAP
+ICEDTEA_PATCHES += \
+	patches/hotspot/aarch64/systemtap_gc.patch
+endif
 endif
 
 ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
--- a/hotspot.map	Fri Jun 13 20:23:50 2014 +0100
+++ b/hotspot.map	Fri Jun 13 23:03:30 2014 +0100
@@ -1,3 +1,3 @@
 # version type(drop/hg) url changeset sha256sum
 default drop http://icedtea.classpath.org/download/drops/icedtea7/2.5 5dc3dd2819c8 645a43adaec3be3d3297479d134c02e444af9f0be33d35942f0ca863592fea26
-aarch64 hg http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c
+aarch64 drop http://icedtea.classpath.org/download/drops/aarch64/2.5 d17532dbc6a7 3ad1f3116d30fb937719c6c462e070d689170dcf99173f785a9b13db074e1938