commit 563cf332e4560601207b2d039b42f6b0fdff8ce8
author Nicolas Geoffray <ngeoffray@google.com> Wed Mar 16 10:22:09 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Mar 16 10:22:09 2016 +0000
tree 2584f2a938507b6d0fcd18915f627992f1eccfd6
parent 448f21e2c1cb43b193736598719979ebd2aed0b0

Revert "Tentative fix for build breakage with read barriers."

This reverts commit 448f21e2c1cb43b193736598719979ebd2aed0b0.

Change-Id: Id821effa06697b1464581bcd9c8f34cd0ea69896

runtime/arch/arm/quick_entrypoints_arm.S

diff --git a/runtime/arch/arm/quick_entrypoints_arm.S b/runtime/arch/arm/quick_entrypoints_arm.S
index 82ec0b7..bd1b33f 100644
--- a/runtime/arch/arm/quick_entrypoints_arm.S
+++ b/runtime/arch/arm/quick_entrypoints_arm.S
@@ -1125,7 +1125,7 @@
     // r0: type_idx/return value, r1: ArtMethod*, r9: Thread::Current
     // r2, r3, r12: free.
 #if defined(USE_READ_BARRIER)
-    mvn    r0, #0                                             // Read barrier not supported here.
+    mvn    x0, #0                                             // Read barrier not supported here.
     bx     lr                                                 // Return -1.
 #endif
     ldr    r2, [r1, #ART_METHOD_DEX_CACHE_TYPES_OFFSET_32]    // Load dex cache resolved types array