Mercurial > hg > truffle
changeset 2331:9f44e9aad2d9
7022999: Can't build with FORCE_TIERED=0
Summary: Put UseFastLocking test under #ifdef COMPILER1
Reviewed-by: kvn, phh, never, dcubed
author | coleenp |
---|---|
date | Thu, 03 Mar 2011 19:51:36 -0500 |
parents | a3c0ec0428a2 |
children | fbbeec6dad2d |
files | src/share/vm/runtime/arguments.cpp |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Wed Mar 02 16:21:47 2011 -0800 +++ b/src/share/vm/runtime/arguments.cpp Thu Mar 03 19:51:36 2011 -0500 @@ -3114,7 +3114,11 @@ // Turn off biased locking for locking debug mode flags, // which are subtlely different from each other but neither works with // biased locking. - if (!UseFastLocking || UseHeavyMonitors) { + if (UseHeavyMonitors +#ifdef COMPILER1 + || !UseFastLocking +#endif // COMPILER1 + ) { if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) { // flag set to true on command line; warn the user that they // can't enable biased locking here