changeset 2500:8c8a8bcc71a7

Merge
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 24 Mar 2011 16:03:19 +0000
parents 21ce5e4c0a69 (current diff) 1e6b2d4fbb71 (diff)
children 100f2c821aa5
files ChangeLog
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 23 13:22:40 2011 +0000
+++ b/ChangeLog	Thu Mar 24 16:03:19 2011 +0000
@@ -1,3 +1,11 @@
+2011-03-24  Xerxes Ranby  <xerxes@zafena.se>
+
+	JamVM: Base default min and max heap size on physical memory.
+	* NEWS: Updated.
+	* Makefile.am
+	(JAMVM_VERSION): Updated to latest JamVM revision.
+	(JAMVM_SHA256SUM): Updated.
+
 2011-03-23  Andrew John Hughes  <ahughes@redhat.com>
 
 	* hotspot.map:
--- a/Makefile.am	Wed Mar 23 13:22:40 2011 +0000
+++ b/Makefile.am	Thu Mar 24 16:03:19 2011 +0000
@@ -11,8 +11,8 @@
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 
-JAMVM_VERSION = 5c1ee07b78ecf18b24493b1759e20a7e22570c19
-JAMVM_SHA256SUM = c4268e452325c7df1661f1588a754c2db127542cc1ce4377f8e7ef222b51d305
+JAMVM_VERSION = cc6997003dd65ba5a32df471b7c0547fba9769f2
+JAMVM_SHA256SUM = 731f913978d15dd1753ef434b4f237237f37280b07e3d1905e76e8c03034fbde
 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
 JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
 JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
--- a/NEWS	Wed Mar 23 13:22:40 2011 +0000
+++ b/NEWS	Thu Mar 24 16:03:19 2011 +0000
@@ -24,6 +24,7 @@
   - CA156: uncaughtExceptionHandler doesn't work with OpenJDK 6 b21.
   - CA157: ARM SMP Assertion thinlock failed.
 * JamVM
+  - Base default min and max heap size on physical memory.
   - Fix reflective array access.
   - Handle O_DELETE in JVM_Open.
   - Minor performance improvement on ARM.