mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 06:45:07 +02:00
Merge
This commit is contained in:
commit
ba4994e447
61 changed files with 937 additions and 180 deletions
|
@ -2649,6 +2649,10 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
|
|||
if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
|
||||
IgnoreUnrecognizedVMOptions = false;
|
||||
}
|
||||
if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
|
||||
CommandLineFlags::printFlags();
|
||||
vm_exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
if (IgnoreUnrecognizedVMOptions) {
|
||||
|
@ -2806,15 +2810,18 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
|
|||
}
|
||||
#endif
|
||||
|
||||
if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
|
||||
warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output");
|
||||
DebugNonSafepoints = true;
|
||||
}
|
||||
|
||||
if (PrintCommandLineFlags) {
|
||||
CommandLineFlags::printSetFlags();
|
||||
}
|
||||
|
||||
#ifdef ASSERT
|
||||
if (PrintFlagsFinal) {
|
||||
CommandLineFlags::printFlags();
|
||||
}
|
||||
#endif
|
||||
|
||||
return JNI_OK;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue