commit 2e287754fcc0f3ecd10fcc9623800d935618360a
author Hiroshi Yamauchi <yamauchi@google.com> Fri Oct 02 13:41:34 2015 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Fri Oct 02 13:41:34 2015 -0700
tree 11841f17c86c076da7fc1a758d20c8841c3cb65c
parent 42888b28d2a0f112187c906296d4b28674c8bee2

Make it possible to change the read barrier type as build config.

Bug: 12687968
Change-Id: Ib43dab4d4e68a5a962347fcc2163c3100cb5b760

runtime/read_barrier_c.h

diff --git a/runtime/read_barrier_c.h b/runtime/read_barrier_c.h
index 710c21f..8e5b187 100644
--- a/runtime/read_barrier_c.h
+++ b/runtime/read_barrier_c.h
@@ -26,10 +26,16 @@
 // table-lookup read barriers.
 
 #ifdef ART_USE_READ_BARRIER
+#if ART_READ_BARRIER_TYPE_IS_BAKER
 #define USE_BAKER_READ_BARRIER
-// #define USE_BROOKS_READ_BARRIER
-// #define USE_TABLE_LOOKUP_READ_BARRIER
+#elif ART_READ_BARRIER_TYPE_IS_BROOKS
+#define USE_BROOKS_READ_BARRIER
+#elif ART_READ_BARRIER_TYPE_IS_TABLELOOKUP
+#define USE_TABLE_LOOKUP_READ_BARRIER
+#else
+#error "ART read barrier type must be set"
 #endif
+#endif  // ART_USE_READ_BARRIER
 
 #ifdef ART_HEAP_POISONING
 #define USE_HEAP_POISONING