summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hiroshi Yamauchi <yamauchi@google.com> 2015-04-28 01:07:17 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-04-28 01:07:17 +0000
commit3fd79afbb7490f52817f737ecceb694f6618dcf9 (patch)
treef5be67420b90a891441c83acbfc07af8a2d9f8ee
parent97c96f5aab22f75dd54089bdc194588a4b5a2e8d (diff)
parent8365a99dc5a70216ec43c78bfaa7e6953ef4decd (diff)
Merge "Switch the default read barrier type to a Baker one."
-rw-r--r--runtime/read_barrier_c.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/read_barrier_c.h b/runtime/read_barrier_c.h
index a2c4c36a2f..88bda3a900 100644
--- a/runtime/read_barrier_c.h
+++ b/runtime/read_barrier_c.h
@@ -26,9 +26,9 @@
// table-lookup read barriers.
#ifdef ART_USE_READ_BARRIER
-// #define USE_BAKER_READ_BARRIER
+#define USE_BAKER_READ_BARRIER
// #define USE_BROOKS_READ_BARRIER
-#define USE_TABLE_LOOKUP_READ_BARRIER
+// #define USE_TABLE_LOOKUP_READ_BARRIER
#endif
#if defined(USE_BAKER_READ_BARRIER) || defined(USE_BROOKS_READ_BARRIER)