--- a/src/share/vm/runtime/arguments.cpp	Fri Oct 22 17:33:24 2010 +0200
+++ b/src/share/vm/runtime/arguments.cpp	Mon Oct 25 16:47:52 2010 +0200
@@ -32,6 +32,8 @@
 int     Arguments::_num_jvm_flags               = 0;
 char**  Arguments::_jvm_args_array              = NULL;
 int     Arguments::_num_jvm_args                = 0;
+char**  Arguments::_c1x_args_array              = NULL;
+int     Arguments::_num_c1x_args                = 0;
 char*  Arguments::_java_command                 = NULL;
 SystemProperty* Arguments::_system_properties   = NULL;
 const char*  Arguments::_gc_log_filename        = NULL;
@@ -686,6 +688,10 @@
   add_string(&_jvm_flags_array, &_num_jvm_flags, arg);
 }
 
+void Arguments::add_c1x_arg(const char* arg) {
+  add_string(&_c1x_args_array, &_num_c1x_args, arg);
+}
+
 // utility function to return a string that concatenates all
 // strings in a given char** array
 const char* Arguments::build_resource_string(char** args, int count) {
@@ -2543,6 +2549,13 @@
           return JNI_EINVAL;
         }
       }
+    } else if (match_option(option, "-C1X:", &tail)) { // -C1X:xxxx
+      // Option for the C1X compiler.
+      if (PrintVMOptions) {
+        tty->print_cr("C1X option %s", tail);
+      }
+      Arguments::add_c1x_arg(tail);
+
     // Unknown option
     } else if (is_bad_option(option, args->ignoreUnrecognized)) {
       return JNI_ERR;