summaryrefslogtreecommitdiff
path: root/compiler/optimizing/optimizing_compiler.cc
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2015-11-25 17:05:40 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-11-25 17:05:40 +0000
commit92e997d1e6fc0774c177b490619f9acdf97a5bb7 (patch)
tree93279a55e4580eb093bd2caf132a8ba335e86029 /compiler/optimizing/optimizing_compiler.cc
parente8bc4ec44a855b2e4174ba3e0efd9b59c52064e4 (diff)
parent22ccc3a93d32fa6991535eaebb17daf5abaf4ebf (diff)
Merge "ARM64 read barrier support for concurrent GC in Optimizing."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r--compiler/optimizing/optimizing_compiler.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index dec08d8978..8440813a87 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -391,10 +391,11 @@ static bool IsInstructionSetSupported(InstructionSet instruction_set) {
|| instruction_set == kX86_64;
}
-// Read barrier are supported only on ARM, x86 and x86-64 at the moment.
+// Read barrier are supported on ARM, ARM64, x86 and x86-64 at the moment.
// TODO: Add support for other architectures and remove this function
static bool InstructionSetSupportsReadBarrier(InstructionSet instruction_set) {
- return instruction_set == kThumb2
+ return instruction_set == kArm64
+ || instruction_set == kThumb2
|| instruction_set == kX86
|| instruction_set == kX86_64;
}