Mercurial > hg > release > icedtea7-2.0

view patches/jamvm/gb-memory-fix.patch @ 2479:ee3b02974ac6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2011-09-26 Xerxes Ranby <xerxes@zafena.se> Mark David Dumlao <madumlao@gmail.com> JamVM - Skip Java-reflection-related DelegatingClassLoaders, enables JamVM to run NetBeans. - Generic JNI stubs for common JNI method signatures. - Fix memory heap arguments in terms of gigabytes. * NEWS: Updated. * patches/jamvm/gb-memory-fix.patch: New patch contributed by Mark David Dumlao. * patches/jamvm/jmm_GetLongAttribute_201.patch: Replaced by upstream, Tidy-ups, changeset 106ffbb35fb9c185ba8c649441036d00e44c6a32. * Makefile.am (ICEDTEA_PATCHES): Apply new JamVM patch, remove upstreamed JamVM patch. (JAMVM_VERSION): Updated JamVM to 2011-09-24 revision. (JAMVM_SHA256SUM): Updated.
author Xerxes Ranby <xerxes@zafena.se>
date Mon, 26 Sep 2011 14:10:17 +0200
parents
children
line wrap: on
line source

diff -Nru jamvm/jamvm/src/init.c jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa/src/init.c
--- jamvm.orig/jamvm/src/init.c	2011-03-25 17:36:12.000000000 +0800
+++ jamvm/jamvm/src/init.c	2011-09-26 16:54:08.000000000 +0800
@@ -123,6 +123,11 @@
         case '\0':
             break;
 
+        case 'G':
+        case 'g':
+	    n *= GB;
+	    break;
+
         case 'M':
         case 'm':
             n *= MB;
diff -Nru jamvm/jamvm/src/jam.h jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa/src/jam.h
--- jamvm.orig/jamvm/src/jam.h	2011-03-25 17:36:12.000000000 +0800
+++ jamvm/jamvm/src/jam.h	2011-09-26 16:51:56.000000000 +0800
@@ -734,6 +734,7 @@
 
 #define KB 1024
 #define MB (KB*KB)
+#define GB (MB*KB)
 
 /* minimum allowable size of object heap */
 #define MIN_HEAP 4*KB