/hg/icedtea6: CACAO: Ignore all unknown options.

[xranby at icedtea.classpath.org]

changeset 13df4d5a5bc2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=13df4d5a5bc2
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri Mar 04 02:13:35 2011 +0100

	CACAO: Ignore all unknown options.

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

	 CACAO: Ignore all unknown options.
		* Makefile.am: Add CACAO patch.
		* patches/cacao/ignore-unknown-options.patch: Added.


diffstat:

3 files changed, 12 insertions(+), 1 deletion(-)
ChangeLog                                  |    4 ++++
Makefile.am                                |    1 -
patches/cacao/ignore-unknown-options.patch |    8 ++++++++

diffs (47 lines):

diff -r 0df8f7938769 -r 13df4d5a5bc2 ChangeLog
--- a/ChangeLog	Thu Mar 03 15:32:46 2011 +0100
+++ b/ChangeLog	Fri Mar 04 02:13:35 2011 +0100
@@ -1,3 +1,9 @@ 2011-03-03  Xerxes Ranby  <xerxes at zafena
+2011-03-04  Xerxes Ranby  <xerxes at zafena.se>
+
+	CACAO: Ignore all unknown options.
+	* Makefile.am: Add CACAO patch.
+	* patches/cacao/ignore-unknown-options.patch: Added.
+
 2011-03-03  Xerxes Ranby  <xerxes at zafena.se>
 
 	JamVM: Ignore all unknown options.
diff -r 0df8f7938769 -r 13df4d5a5bc2 Makefile.am
--- a/Makefile.am	Thu Mar 03 15:32:46 2011 +0100
+++ b/Makefile.am	Fri Mar 04 02:13:35 2011 +0100
@@ -347,7 +347,8 @@ ICEDTEA_PATCHES += \
 	patches/cacao/launcher.patch \
 	patches/cacao/arm-arch-defines.patch \
 	patches/cacao/jsig.patch \
-	patches/cacao/memory.patch
+	patches/cacao/memory.patch \
+	patches/cacao/ignore-unknown-options.patch
 endif
 
 if ENABLE_CACAO
diff -r 0df8f7938769 -r 13df4d5a5bc2 patches/cacao/ignore-unknown-options.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/ignore-unknown-options.patch	Fri Mar 04 02:13:35 2011 +0100
@@ -0,0 +1,17 @@
+Index: cacao/cacao/src/vm/vm.cpp
+===================================================================
+--- cacao.orig/cacao/src/vm/vm.cpp	2011-03-04 00:20:24.000000000 +0100
++++ cacao/cacao/src/vm/vm.cpp	2011-03-04 01:12:45.000000000 +0100
+@@ -1239,9 +1239,10 @@
+ 
+ #endif
+ 		default:
+-			printf("Unknown option: %s\n",
++			fprintf(stderr,"Unknown option: %s\n",
+ 				   vm_args->options[opt_index].optionString);
+-			usage();
++			opt_index++;
++			/* Ignore */
+ 		}
+ 	}
+