diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-06 01:13:39 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-06 01:34:07 -0800 |
| commit | befbd5731ecca08f08780ee28a913d08ffb14656 (patch) | |
| tree | ee359fc38671950afa91d96bf8c29232a799b628 /compiler/utils/assembler.cc | |
| parent | 97c3d61e46a3678dac848578c686c724ec3397fa (diff) | |
| download | art-befbd5731ecca08f08780ee28a913d08ffb14656.tar.gz art-befbd5731ecca08f08780ee28a913d08ffb14656.tar.bz2 art-befbd5731ecca08f08780ee28a913d08ffb14656.zip | |
Fix host architecture for 64bit.
Also, hack x86 assembler for use as a x86-64 trampoline compiler's assembler.
Implement missing x86-64 quick resolution trampoline.
Add x86-64 to the quick elf writer.
Change-Id: I08216c67014a83492ada12898ab8000218ba7bb4
Diffstat (limited to 'compiler/utils/assembler.cc')
| -rw-r--r-- | compiler/utils/assembler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/utils/assembler.cc b/compiler/utils/assembler.cc index 67324764f..a7cb2784a 100644 --- a/compiler/utils/assembler.cc +++ b/compiler/utils/assembler.cc @@ -111,7 +111,8 @@ Assembler* Assembler::Create(InstructionSet instruction_set) { return new arm64::Arm64Assembler(); case kMips: return new mips::MipsAssembler(); - case kX86: + case kX86: // Fall-through. + case kX86_64: return new x86::X86Assembler(); default: LOG(FATAL) << "Unknown InstructionSet: " << instruction_set; |