diff options
| author | 2016-01-12 23:45:26 +0000 | |
|---|---|---|
| committer | 2016-01-12 23:45:26 +0000 | |
| commit | 922698ded1e80cad1ecce4c2172a88c76a216373 (patch) | |
| tree | 86ff9ec81ac67cfe8476c33fc94286333e4ec4e9 /runtime/interpreter/interpreter.cc | |
| parent | 0b0dc293402ec3d13982d74becae429f04a49c91 (diff) | |
| parent | 987e44e6b65677587f37c26e630ddc4d4c563382 (diff) | |
Merge "Disable mterp for the read barrier config."
Diffstat (limited to 'runtime/interpreter/interpreter.cc')
| -rw-r--r-- | runtime/interpreter/interpreter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index 6b5218dff0..e7b4731ef8 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -239,7 +239,7 @@ static std::ostream& operator<<(std::ostream& os, const InterpreterImplKind& rhs } #if !defined(__clang__) -#if defined(__arm__) +#if defined(__arm__) && !defined(ART_USE_READ_BARRIER) // TODO: remove when all targets implemented. static constexpr InterpreterImplKind kInterpreterImplKind = kMterpImplKind; #else @@ -247,7 +247,7 @@ static constexpr InterpreterImplKind kInterpreterImplKind = kComputedGotoImplKin #endif #else // Clang 3.4 fails to build the goto interpreter implementation. -#if defined(__arm__) +#if defined(__arm__) && !defined(ART_USE_READ_BARRIER) static constexpr InterpreterImplKind kInterpreterImplKind = kMterpImplKind; #else static constexpr InterpreterImplKind kInterpreterImplKind = kSwitchImplKind; |