Mercurial > hg > release > icedtea7-2.0

changeset 2404:1a8a40f21e15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CACAO: Ignore all unknown options. 2011-03-04 Xerxes Ranby <xerxes@zafena.se> CACAO: Ignore all unknown options. * Makefile.am: Add CACAO patch. * patches/cacao/ignore-unknown-options.patch: Added.
author Xerxes R?nby <xerxes@zafena.se>
date Thu, 19 May 2011 23:39:17 +0100
parents d8aa2906143e
children 709acc7941bf
files ChangeLog Makefile.am patches/cacao/ignore-unknown-options.patch
diffstat 3 files changed, 25 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Mar 03 15:32:46 2011 +0100
+++ b/ChangeLog	Thu May 19 23:39:17 2011 +0100
@@ -1,3 +1,9 @@
+2011-03-04  Xerxes Ranby  <xerxes@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@zafena.se>
 
 	JamVM: Ignore all unknown options.
--- a/Makefile.am	Thu Mar 03 15:32:46 2011 +0100
+++ b/Makefile.am	Thu May 19 23:39:17 2011 +0100
@@ -302,7 +302,8 @@
 	patches/cacao/arm-arch-defines.patch \
 	patches/cacao/jsig.patch \
 	patches/cacao/6714758.patch \
-	patches/cacao/memory.patch
+	patches/cacao/memory.patch \
+	patches/cacao/ignore-unknown-options.patch
 endif
 
 if WITH_CACAO
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/ignore-unknown-options.patch	Thu May 19 23:39:17 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 */
+ 		}
+ 	}
+