/hg/release/icedtea6-1.10: JamVM: remove upstreamed patch.

[xranby at icedtea.classpath.org]

changeset 96a8975a5049 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=96a8975a5049
author: Xerxes R?nby <xerxes at zafena.se>
date: Sat Mar 12 20:57:17 2011 +0100

	JamVM: remove upstreamed patch.

	2011-03-12 Xerxes Ranby <xerxes at zafena.se>

	 JamVM: remove upstreamed patch.
		* Makefile.am: Remove upstreamed JamVM patch.
		* patches/jamvm/ignore-more-XX-options.patch: Deleted.


diffstat:

 ChangeLog                                  |   6 ++++++
 Makefile.am                                |   1 -
 patches/jamvm/ignore-more-XX-options.patch |  11 -----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diffs (40 lines):

diff -r e1efdb7e7fa5 -r 96a8975a5049 ChangeLog
--- a/ChangeLog	Fri Mar 11 16:40:00 2011 +0100
+++ b/ChangeLog	Sat Mar 12 20:57:17 2011 +0100
@@ -1,3 +1,9 @@
+2011-03-12  Xerxes Ranby  <xerxes at zafena.se>
+
+	JamVM: remove upstreamed patch.
+	* Makefile.am: Remove upstreamed JamVM patch.
+	* patches/jamvm/ignore-more-XX-options.patch: Deleted.
+
 2011-03-11  Xerxes Ranby  <xerxes at zafena.se>
 
 	JamVM: mips
diff -r e1efdb7e7fa5 -r 96a8975a5049 Makefile.am
--- a/Makefile.am	Fri Mar 11 16:40:00 2011 +0100
+++ b/Makefile.am	Sat Mar 12 20:57:17 2011 +0100
@@ -358,7 +358,6 @@
 
 if BUILD_JAMVM
 ICEDTEA_PATCHES += \
-	patches/jamvm/ignore-more-XX-options.patch \
 	patches/jamvm/mips64el.patch
 endif
 
diff -r e1efdb7e7fa5 -r 96a8975a5049 patches/jamvm/ignore-more-XX-options.patch
--- a/patches/jamvm/ignore-more-XX-options.patch	Fri Mar 11 16:40:00 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-Index: jamvm/jamvm/src/jni.c
-===================================================================
---- jamvm/jamvm.orig/src/jni.c	2011-02-23 09:54:17.000000000 +0100
-+++ jamvm/jamvm/src/jni.c	2011-02-23 09:58:21.000000000 +0100
-@@ -1638,6 +1638,7 @@
- #endif
-         /* Compatibility options */
-         } else if(strncmp(string, "-XX:PermSize=", 13) == 0 ||
-+                  strncmp(string, "-XX:ThreadStackSize=", 20) == 0 ||
-                   strncmp(string, "-XX:MaxPermSize=", 16) == 0) {
-             /* Ignore */
-         } else if(!vm_args->ignoreUnrecognized) {