mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 07:14:30 +02:00
Merge
This commit is contained in:
commit
59716b0bb3
85 changed files with 3119 additions and 241 deletions
|
@ -2061,6 +2061,9 @@ bool Arguments::check_vm_args_consistency() {
|
|||
log_warning(arguments) ("NUMA support for Heap depends on the file system when AllocateHeapAt option is used.\n");
|
||||
}
|
||||
}
|
||||
|
||||
status = status && GCArguments::check_args_consistency();
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
|
@ -2952,6 +2955,7 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m
|
|||
}
|
||||
#endif // LINUX
|
||||
fix_appclasspath();
|
||||
|
||||
return JNI_OK;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue