diff -r 35f4f3d2812b -r 4ace9ef0201b hotspot/src/share/vm/runtime/arguments.hpp
--- a/hotspot/src/share/vm/runtime/arguments.hpp	Fri Jan 08 12:56:16 2016 +0000
+++ b/hotspot/src/share/vm/runtime/arguments.hpp	Fri Jan 08 15:38:08 2016 -0800
@@ -379,12 +379,15 @@
   static jint parse_vm_options_file(const char* file_name, ScopedVMInitArgs* vm_args);
   static jint parse_options_buffer(const char* name, char* buffer, const size_t buf_len, ScopedVMInitArgs* vm_args);
   static jint insert_vm_options_file(const JavaVMInitArgs* args,
-                                     char** vm_options_file,
+                                     const char* vm_options_file,
                                      const int vm_options_file_pos,
                                      ScopedVMInitArgs* vm_options_file_args,
                                      ScopedVMInitArgs* args_out);
+  static bool args_contains_vm_options_file_arg(const JavaVMInitArgs* args);
+  static jint expand_vm_options_as_needed(const JavaVMInitArgs* args_in,
+                                          ScopedVMInitArgs* mod_args,
+                                          JavaVMInitArgs** args_out);
   static jint match_special_option_and_act(const JavaVMInitArgs* args,
-                                           char** vm_options_file,
                                            ScopedVMInitArgs* args_out);
 
   static jint parse_vm_init_args(const JavaVMInitArgs *java_tool_options_args,