/hg/icedtea6: 2011-09-26 Xerxes Ranby <xerxes at zafena.se>
xranby at icedtea.classpath.org
xranby at icedtea.classpath.org
Mon Sep 26 04:53:45 PDT 2011
changeset af642d6ae50e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=af642d6ae50e
author: Xerxes Ranby <xerxes at zafena.se>
date: Mon Sep 26 14:03:11 2011 +0200
2011-09-26 Xerxes Ranby <xerxes at zafena.se> Mark David
Dumlao <madumlao at 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.
diffstat:
ChangeLog | 19 +++++++++++++++++++
Makefile.am | 6 +++---
NEWS | 4 ++++
patches/jamvm/gb-memory-fix.patch | 24 ++++++++++++++++++++++++
patches/jamvm/jmm_GetLongAttribute_201.patch | 21 ---------------------
5 files changed, 50 insertions(+), 24 deletions(-)
diffs (119 lines):
diff -r a65a115e0fbc -r af642d6ae50e ChangeLog
--- a/ChangeLog Wed Sep 21 14:48:54 2011 +0200
+++ b/ChangeLog Mon Sep 26 14:03:11 2011 +0200
@@ -1,3 +1,22 @@
+2011-09-26 Xerxes RÃ¥nby <xerxes at zafena.se>
+ Mark David Dumlao <madumlao at 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.
+
2011-09-21 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/jtreg-international-fonts.patch:
diff -r a65a115e0fbc -r af642d6ae50e Makefile.am
--- a/Makefile.am Wed Sep 21 14:48:54 2011 +0200
+++ b/Makefile.am Mon Sep 26 14:03:11 2011 +0200
@@ -11,8 +11,8 @@
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
-JAMVM_VERSION = 12d05e620a9fda129925104bc848014f91d971db
-JAMVM_SHA256SUM = b7e3999f5b46cfddcf717b2d06460d34167fe9eb3b306a311f1df6d31b99ef32
+JAMVM_VERSION = 310c491ddc14e92a6ffff27030a1a1821e6395a8
+JAMVM_SHA256SUM = b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a
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
@@ -401,7 +401,7 @@
if BUILD_JAMVM
ICEDTEA_PATCHES += \
- patches/jamvm/jmm_GetLongAttribute_201.patch \
+ patches/jamvm/gb-memory-fix.patch \
patches/jamvm/ignore-assertions-and-verify-options.patch
endif
diff -r a65a115e0fbc -r af642d6ae50e NEWS
--- a/NEWS Wed Sep 21 14:48:54 2011 +0200
+++ b/NEWS Mon Sep 26 14:03:11 2011 +0200
@@ -386,6 +386,10 @@
- PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit.
- LP827463: Fix OpenJDK enclosingMethodInfo().
- Add support for armhf.
+ - 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.
- armhf: ensure stack is 8 byte aligned.
- "Fix" handling of CLI bootclasspath options.
- Fix for StackTraceElement checkin.
diff -r a65a115e0fbc -r af642d6ae50e patches/jamvm/gb-memory-fix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/gb-memory-fix.patch Mon Sep 26 14:03:11 2011 +0200
@@ -0,0 +1,26 @@
+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
diff -r a65a115e0fbc -r af642d6ae50e patches/jamvm/jmm_GetLongAttribute_201.patch
--- a/patches/jamvm/jmm_GetLongAttribute_201.patch Wed Sep 21 14:48:54 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Index: jamvm/jamvm/src/classlib/openjdk/management.c
-===================================================================
---- jamvm.orig/jamvm/src/classlib/openjdk/management.c 2011-08-09 23:39:21.067466386 +0200
-+++ jamvm/jamvm/src/classlib/openjdk/management.c 2011-08-09 23:43:21.987466384 +0200
-@@ -146,6 +146,9 @@
- case JMM_JVM_INIT_DONE_TIME_MS:
- result = 0;
- break;
-+ case JMM_OS_PROCESS_ID:
-+ result = getpid();
-+ break;
-
- case JMM_CLASS_LOADED_COUNT:
- case JMM_CLASS_UNLOADED_COUNT:
-@@ -153,7 +156,6 @@
- case JMM_THREAD_LIVE_COUNT:
- case JMM_THREAD_PEAK_COUNT:
- case JMM_THREAD_DAEMON_COUNT:
-- case JMM_OS_PROCESS_ID:
-
- default:
- UNIMPLEMENTED("jmm_GetLongAttribute: Unknown attribute %d", att);
More information about the distro-pkg-dev
mailing list