Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/arguments.cpp @ 14478:bb9356ec5967
Merge
author | hseigel |
---|---|
date | Sun, 23 Feb 2014 13:16:03 -0500 |
parents | de7f1b016d55 8a9bb7821e28 |
children | 16c705d792be |
comparison
equal
deleted
inserted
replaced
14477:96d2c94bbdd0 | 14478:bb9356ec5967 |
---|---|
47 #ifdef TARGET_OS_FAMILY_solaris | 47 #ifdef TARGET_OS_FAMILY_solaris |
48 # include "os_solaris.inline.hpp" | 48 # include "os_solaris.inline.hpp" |
49 #endif | 49 #endif |
50 #ifdef TARGET_OS_FAMILY_windows | 50 #ifdef TARGET_OS_FAMILY_windows |
51 # include "os_windows.inline.hpp" | 51 # include "os_windows.inline.hpp" |
52 #endif | |
53 #ifdef TARGET_OS_FAMILY_aix | |
54 # include "os_aix.inline.hpp" | |
52 #endif | 55 #endif |
53 #ifdef TARGET_OS_FAMILY_bsd | 56 #ifdef TARGET_OS_FAMILY_bsd |
54 # include "os_bsd.inline.hpp" | 57 # include "os_bsd.inline.hpp" |
55 #endif | 58 #endif |
56 #if INCLUDE_ALL_GCS | 59 #if INCLUDE_ALL_GCS |
295 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 298 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
296 { "UseISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 299 { "UseISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
297 { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 300 { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
298 { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 301 { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
299 { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 302 { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
303 { "UseOldInlining", JDK_Version::jdk(9), JDK_Version::jdk(10) }, | |
300 #ifdef PRODUCT | 304 #ifdef PRODUCT |
301 { "DesiredMethodLimit", | 305 { "DesiredMethodLimit", |
302 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, | 306 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, |
303 #endif // PRODUCT | 307 #endif // PRODUCT |
304 { NULL, JDK_Version(0), JDK_Version(0) } | 308 { NULL, JDK_Version(0), JDK_Version(0) } |
3759 "; ignoring UseBiasedLocking flag." ); | 3763 "; ignoring UseBiasedLocking flag." ); |
3760 } | 3764 } |
3761 UseBiasedLocking = false; | 3765 UseBiasedLocking = false; |
3762 } | 3766 } |
3763 | 3767 |
3764 #ifdef CC_INTERP | 3768 #ifdef ZERO |
3765 // Clear flags not supported by the C++ interpreter | 3769 // Clear flags not supported on zero. |
3766 FLAG_SET_DEFAULT(ProfileInterpreter, false); | 3770 FLAG_SET_DEFAULT(ProfileInterpreter, false); |
3767 FLAG_SET_DEFAULT(UseBiasedLocking, false); | 3771 FLAG_SET_DEFAULT(UseBiasedLocking, false); |
3768 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false)); | 3772 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false)); |
3769 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedClassPointers, false)); | 3773 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedClassPointers, false)); |
3770 #endif // CC_INTERP | 3774 #endif // CC_INTERP |