diff options
| author | Ben Cheng <bccheng@android.com> | 2010-05-28 15:28:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-28 15:28:05 -0700 |
| commit | b0135401b23530a813f5067878e54d52cb1365b2 (patch) | |
| tree | 1688ac8ef7f66e45df0f8160e48ccf620897d92c /vm/compiler/codegen/arm/CodegenDriver.c | |
| parent | 8be96eee975706074cd512af710344e5d4118e64 (diff) | |
| parent | fc075c2d1ae63c26f96e0c6eeb72efc898dbebbf (diff) | |
Merge "Clean up warnings detected by gcc." into dalvik-dev
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenDriver.c')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index f625771ec..dbb85c9b2 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -1214,6 +1214,8 @@ static void genInterpSingleStep(CompilationUnit *cUnit, MIR *mir) opReg(cUnit, kOpBlx, r2); } +#if defined(WITH_DEADLOCK_PREDICTION) || defined(WITH_MONITOR_TRACKING) || \ + defined(_ARMV5TE) || defined(_ARMV5TE_VFP) /* * To prevent a thread in a monitor wait from blocking the Jit from * resetting the code cache, heavyweight monitor lock will not @@ -1259,6 +1261,7 @@ static void genMonitorPortable(CompilationUnit *cUnit, MIR *mir) dvmCompilerClobberCallRegs(cUnit); } } +#endif /* * The following are the first-level codegen routines that analyze the format |