--- a/src/share/vm/runtime/thread.cpp	Thu May 28 17:13:22 2015 +0200
+++ b/src/share/vm/runtime/thread.cpp	Thu May 28 21:58:33 2015 +0200
@@ -3395,6 +3395,13 @@
   jint parse_result = Arguments::parse(args);
   if (parse_result != JNI_OK) return parse_result;
 
+#ifdef JVMCI
+  OptionsValueTable* options = JVMCIRuntime::parse_arguments();
+  if (options == NULL) {
+    return JNI_ERR;
+  }
+#endif
+
   os::init_before_ergo();
 
   jint ergo_result = Arguments::apply_ergo();
@@ -3703,11 +3710,7 @@
   }
 
 #ifdef JVMCI
-  status = JVMCIRuntime::check_arguments(main_thread);
-  if (status != JNI_OK) {
-    *canTryAgain = false; // don't let caller call JNI_CreateJavaVM again
-    return status;
-  }
+  JVMCIRuntime::set_options(options, main_thread);
 #endif
 
   // initialize compiler(s)