8202552: [AOT][JVMCI] Incorrect usage of INCLUDE_JVMCI and INCLUDE_AOT

Reviewed-by: stefank, ihse
This commit is contained in:
Vladimir Kozlov 2018-05-03 09:07:40 -07:00
parent 6a12519d84
commit 8ebfc59cfa
8 changed files with 27 additions and 28 deletions

View file

@ -3317,7 +3317,7 @@ jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) {
FLAG_SET_ERGO(uintx, InitialTenuringThreshold, MaxTenuringThreshold);
}
#if !defined(COMPILER2) && !INCLUDE_JVMCI
#if !COMPILER2_OR_JVMCI
// Don't degrade server performance for footprint
if (FLAG_IS_DEFAULT(UseLargePages) &&
MaxHeapSize < LargePageHeapSizeThreshold) {
@ -3333,7 +3333,7 @@ jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) {
}
#endif
#if !defined(COMPILER2) && !INCLUDE_JVMCI
#if !COMPILER2_OR_JVMCI
UNSUPPORTED_OPTION(ProfileInterpreter);
NOT_PRODUCT(UNSUPPORTED_OPTION(TraceProfileInterpreter));
#endif