From 987e44e6b65677587f37c26e630ddc4d4c563382 Mon Sep 17 00:00:00 2001 From: Hiroshi Yamauchi Date: Tue, 12 Jan 2016 12:05:08 -0800 Subject: [PATCH] Disable mterp for the read barrier config. For now. Volantis boots with this. Bug: 26510411 Bug: 12687968 Change-Id: Ifc9799404306c973ad1085c42c399d6eef05dcc6 --- runtime/interpreter/interpreter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index 47e2e9854..f362751bc 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; -- 2.11.0