diff options
| author | 2016-01-12 12:05:08 -0800 | |
|---|---|---|
| committer | 2016-01-12 12:05:08 -0800 | |
| commit | 987e44e6b65677587f37c26e630ddc4d4c563382 (patch) | |
| tree | 98b76564a6ab31b41fd18ceb8b8d99207d66efbd | |
| parent | c3ba07ef76549129705af28173070b88a1c39531 (diff) | |
Disable mterp for the read barrier config.
For now. Volantis boots with this.
Bug: 26510411
Bug: 12687968
Change-Id: Ifc9799404306c973ad1085c42c399d6eef05dcc6
| -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 47e2e98544..f362751bc6 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; |