Mercurial > hg > truffle
diff src/share/vm/runtime/arguments.cpp @ 14460:8a9bb7821e28
Merge
| author | kvn |
|---|---|
| date | Wed, 19 Feb 2014 12:08:49 -0800 |
| parents | 5e1086b5b726 45467c53f178 |
| children | bb9356ec5967 9a83b7b3e37c |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Thu Feb 13 17:57:27 2014 +0100 +++ b/src/share/vm/runtime/arguments.cpp Wed Feb 19 12:08:49 2014 -0800 @@ -50,6 +50,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" #endif +#ifdef TARGET_OS_FAMILY_aix +# include "os_aix.inline.hpp" +#endif #ifdef TARGET_OS_FAMILY_bsd # include "os_bsd.inline.hpp" #endif @@ -297,6 +300,7 @@ { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, + { "UseOldInlining", JDK_Version::jdk(9), JDK_Version::jdk(10) }, #ifdef PRODUCT { "DesiredMethodLimit", JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, @@ -3741,8 +3745,8 @@ UseBiasedLocking = false; } -#ifdef CC_INTERP - // Clear flags not supported by the C++ interpreter +#ifdef ZERO + // Clear flags not supported on zero. FLAG_SET_DEFAULT(ProfileInterpreter, false); FLAG_SET_DEFAULT(UseBiasedLocking, false); LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false));