summaryrefslogtreecommitdiff
path: root/compiler/utils/assembler.cc
diff options
context:
space:
mode:
author Ian Rogers <irogers@google.com> 2014-03-05 20:17:59 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-03-05 20:18:00 +0000
commit8b9a8deb04910a2f2485a578ba6808111ed0967a (patch)
treee93e3d1e7dd6770ec8e2a3ed7105a7305eb2bc4d /compiler/utils/assembler.cc
parent511472b9110d15cf30a205bb514eb98f6afce651 (diff)
parented8dd492e43cbaaa435c4892447072c84dbaf2dc (diff)
Merge "AArch64: Add ARM64 Assembler"
Diffstat (limited to 'compiler/utils/assembler.cc')
-rw-r--r--compiler/utils/assembler.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/utils/assembler.cc b/compiler/utils/assembler.cc
index 92ce0b8001..67324764f0 100644
--- a/compiler/utils/assembler.cc
+++ b/compiler/utils/assembler.cc
@@ -20,6 +20,7 @@
#include <vector>
#include "arm/assembler_arm.h"
+#include "arm64/assembler_arm64.h"
#include "mips/assembler_mips.h"
#include "x86/assembler_x86.h"
#include "globals.h"
@@ -106,6 +107,8 @@ Assembler* Assembler::Create(InstructionSet instruction_set) {
case kArm:
case kThumb2:
return new arm::ArmAssembler();
+ case kArm64:
+ return new arm64::Arm64Assembler();
case kMips:
return new mips::MipsAssembler();
case kX86: