commit 60f63f53c01cb38ca18a815603282e802a6cf918
author Hiroshi Yamauchi <yamauchi@google.com> Thu Apr 23 16:12:40 2015 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Thu Apr 23 21:11:40 2015 -0700
tree 4f18427401ead0c790e926672957189a0c0a39eb
parent 633a37ece49c5afcf3fa9a89692f07d19c56229b

Use the lock word bits for Baker-style read barrier.

This enables the standard object header to be used with the
Baker-style read barrier.

Bug: 19355854
Bug: 12687968

Change-Id: Ie552b6e1dfe30e96cb1d0895bd0dff25f9d7d015

runtime/asm_support.h

diff --git a/runtime/asm_support.h b/runtime/asm_support.h
index 8057dd1..13921e7 100644
--- a/runtime/asm_support.h
+++ b/runtime/asm_support.h
@@ -124,7 +124,7 @@
 #define MIRROR_OBJECT_LOCK_WORD_OFFSET 4
 ADD_TEST_EQ(MIRROR_OBJECT_LOCK_WORD_OFFSET, art::mirror::Object::MonitorOffset().Int32Value())
 
-#if defined(USE_BAKER_OR_BROOKS_READ_BARRIER)
+#if defined(USE_BROOKS_READ_BARRIER)
 #define MIRROR_OBJECT_HEADER_SIZE 16
 #else
 #define MIRROR_OBJECT_HEADER_SIZE 8