comparison src/share/vm/runtime/arguments.hpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 1baf7f1e3f23 53715fb1597d
children 989155e2d07a
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
418 static char* SharedArchivePath; 418 static char* SharedArchivePath;
419 419
420 public: 420 public:
421 // Parses the arguments 421 // Parses the arguments
422 static jint parse(const JavaVMInitArgs* args); 422 static jint parse(const JavaVMInitArgs* args);
423 // Adjusts the arguments after the OS have adjusted the arguments
424 static jint adjust_after_os();
423 // Check for consistency in the selection of the garbage collector. 425 // Check for consistency in the selection of the garbage collector.
424 static bool check_gc_consistency(); 426 static bool check_gc_consistency();
425 // Check consistecy or otherwise of VM argument settings 427 // Check consistecy or otherwise of VM argument settings
426 static bool check_vm_args_consistency(); 428 static bool check_vm_args_consistency();
427 // Check stack pages settings 429 // Check stack pages settings