Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 14456:abec000618bf
Merge
author | kvn |
---|---|
date | Tue, 28 Jan 2014 12:25:34 -0800 |
parents | 8cdf3f43f63e 2da20f966936 |
children | 45467c53f178 f040cf9fc9c0 |
comparison
equal
deleted
inserted
replaced
14269:2a8891e0a082 | 14456:abec000618bf |
---|---|
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 |
3690 "; ignoring UseBiasedLocking flag." ); | 3693 "; ignoring UseBiasedLocking flag." ); |
3691 } | 3694 } |
3692 UseBiasedLocking = false; | 3695 UseBiasedLocking = false; |
3693 } | 3696 } |
3694 | 3697 |
3695 #ifdef CC_INTERP | 3698 #ifdef ZERO |
3696 // Clear flags not supported by the C++ interpreter | 3699 // Clear flags not supported on zero. |
3697 FLAG_SET_DEFAULT(ProfileInterpreter, false); | 3700 FLAG_SET_DEFAULT(ProfileInterpreter, false); |
3698 FLAG_SET_DEFAULT(UseBiasedLocking, false); | 3701 FLAG_SET_DEFAULT(UseBiasedLocking, false); |
3699 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false)); | 3702 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false)); |
3700 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedClassPointers, false)); | 3703 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedClassPointers, false)); |
3701 #endif // CC_INTERP | 3704 #endif // CC_INTERP |