diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-22 16:59:21 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-22 16:59:21 -0800 |
| commit | 2c02ed1578529dbc904062905a7816d10e36003f (patch) | |
| tree | 81937f67aed7ac8882a07a9ab12671b0eefc640e /vm/compiler/codegen/arm/CodegenDriver.c | |
| parent | a1eeebee9017066196bbef6219a3c0d7836df4e9 (diff) | |
| parent | d0937ef76b41a57d25c084e76aed1bb91c6dfde7 (diff) | |
Merge change Ic4433c3d
* changes:
Jit: Update monitor lock/unlock to reflect thinlock changes (I34b20f49)
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenDriver.c')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index 249970cbe..f3648b9bd 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -2098,7 +2098,7 @@ static bool handleFmt11x(CompilationUnit *cUnit, MIR *mir) } case OP_MONITOR_EXIT: case OP_MONITOR_ENTER: -#if 1 || defined(WITH_DEADLOCK_PREDICTION) || defined(WITH_MONITOR_TRACKING) +#if defined(WITH_DEADLOCK_PREDICTION) || defined(WITH_MONITOR_TRACKING) genMonitorPortable(cUnit, mir); #else genMonitor(cUnit, mir); |