diff options
| author | 2014-03-06 01:13:39 -0800 | |
|---|---|---|
| committer | 2014-03-06 01:34:07 -0800 | |
| commit | befbd5731ecca08f08780ee28a913d08ffb14656 (patch) | |
| tree | ee359fc38671950afa91d96bf8c29232a799b628 /compiler/compiled_method.cc | |
| parent | 97c3d61e46a3678dac848578c686c724ec3397fa (diff) | |
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/compiled_method.cc')
| -rw-r--r-- | compiler/compiled_method.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/compiled_method.cc b/compiler/compiled_method.cc index d884bc0ef8..17c2e94652 100644 --- a/compiler/compiled_method.cc +++ b/compiler/compiled_method.cc @@ -88,7 +88,8 @@ uint32_t CompiledCode::AlignCode(uint32_t offset, InstructionSet instruction_set return RoundUp(offset, kArmAlignment); case kMips: return RoundUp(offset, kMipsAlignment); - case kX86: + case kX86: // Fall-through. + case kX86_64: return RoundUp(offset, kX86Alignment); default: LOG(FATAL) << "Unknown InstructionSet: " << instruction_set; |