Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 17812:a7d4d4655766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents 62c54fcc0a35
children f42c10a3d4b1
comparison
equal deleted inserted replaced
17789:6b207d038106 17812:a7d4d4655766
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
3737 "; ignoring UseBiasedLocking flag." ); 3740 "; ignoring UseBiasedLocking flag." );
3738 } 3741 }
3739 UseBiasedLocking = false; 3742 UseBiasedLocking = false;
3740 } 3743 }
3741 3744
3742 #ifdef CC_INTERP 3745 #ifdef ZERO
3743 // Clear flags not supported by the C++ interpreter 3746 // Clear flags not supported on zero.
3744 FLAG_SET_DEFAULT(ProfileInterpreter, false); 3747 FLAG_SET_DEFAULT(ProfileInterpreter, false);
3745 FLAG_SET_DEFAULT(UseBiasedLocking, false); 3748 FLAG_SET_DEFAULT(UseBiasedLocking, false);
3746 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false)); 3749 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false));
3747 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedClassPointers, false)); 3750 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedClassPointers, false));
3748 #endif // CC_INTERP 3751 #endif // CC_INTERP