/hg/icedtea: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 2159b8cf78a7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2159b8cf78a7
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 12 17:25:13 2010 +0100

	Delete all directories created by add-zero and add-zero-debug.

	2010-07-12 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (clean-add-zero): Delete all created
	directories. (clean-add-debug-zero): Likewise.


changeset 190ed35f3340 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=190ed35f3340
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 12 17:25:33 2010 +0100

	Add missing file.


changeset 5a146f117f6d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5a146f117f6d
author: Matthias Klose <doko at ubuntu.com>
date: Mon Jul 12 17:31:25 2010 +0100

	2010-07-12 Matthias Klose <doko at ubuntu.com>

	 * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp:
	Set MaxRAM.


diffstat:

4 files changed, 28 insertions(+), 4 deletions(-)
ChangeLog                                            |   11 +++++++++++
Makefile.am                                          |    9 +++++----
patches/cacao/version-parsing.patch                  |   11 +++++++++++
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp |    1 +

diffs (70 lines):

diff -r b18f5ecf2522 -r 5a146f117f6d ChangeLog
--- a/ChangeLog	Mon Jul 12 11:24:29 2010 +0200
+++ b/ChangeLog	Mon Jul 12 17:31:25 2010 +0100
@@ -1,3 +1,14 @@ 2010-06-28 Andrew John Hughes  <ahughes@
+2010-07-12  Matthias Klose  <doko at ubuntu.com>
+
+	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp:
+	Set MaxRAM.
+
+2010-07-12 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(clean-add-zero): Delete all created directories.
+	(clean-add-debug-zero): Likewise.
+
 2010-06-28 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r b18f5ecf2522 -r 5a146f117f6d Makefile.am
--- a/Makefile.am	Mon Jul 12 11:24:29 2010 +0200
+++ b/Makefile.am	Mon Jul 12 17:31:25 2010 +0100
@@ -2327,11 +2327,10 @@ endif
 
 clean-add-zero:
 	rm -rf $(BUILD_JRE_ARCH_DIR)/zero
+	rm -rf $(BUILD_JRE_ARCH_DIR)/shark
+	rm -rf zerovm
 	sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg
 	sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg
-if ADD_ZERO_BUILD
-	rm -rf zerovm
-endif
 	rm -f stamps/add-zero.stamp
 
 stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp
@@ -2364,7 +2363,9 @@ endif
 	touch $@
 
 clean-add-zero-debug:
-	rm -rf $(BUILD_JRE_ARCH_DIR)/zero
+	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/zero
+	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/shark
+	rm -rf zerovm
 	sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg
 	sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg
 	rm -f stamps/add-zero-debug.stamp
diff -r b18f5ecf2522 -r 5a146f117f6d patches/cacao/version-parsing.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/version-parsing.patch	Mon Jul 12 17:31:25 2010 +0100
@@ -0,0 +1,11 @@
+--- cacao/cacao/m4/version.m4~	2010-06-23 16:18:58.000000000 +0100
++++ cacao/cacao/m4/version.m4	2010-06-24 19:11:36.000000000 +0100
+@@ -29,7 +29,7 @@
+ then
+     major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'`
+     minor=`echo "$version" | $SED -e 's/^[[0-9]]*\.//' -e 's/\.[[0-9a-z.+]]*$//'`
+-    micro=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.//' -e 's/[[a-z.+]]*$//'`
++    micro=`echo "$version" | $SED -r -e 's/^[[0-9]]*\.[[0-9]]*\.([[0-9]]*).*/\1/'`
+     extra=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.[[0-9]]*//'`
+ else
+     major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'`
diff -r b18f5ecf2522 -r 5a146f117f6d ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Mon Jul 12 11:24:29 2010 +0200
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Mon Jul 12 17:31:25 2010 +0100
@@ -59,4 +59,5 @@ define_pd_global(uintx,    MaxPermSize, 
 define_pd_global(uintx,    MaxPermSize,                  64*M );
 define_pd_global(bool,     NeverActAsServerClassMachine, true );
 define_pd_global(uintx,    DefaultMaxRAM,                1*G  );
+define_pd_global(uint64_t, MaxRAM,                      1ULL*G);
 define_pd_global(bool,     CICompileOSR,                 true );