From befbd5731ecca08f08780ee28a913d08ffb14656 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 6 Mar 2014 01:13:39 -0800 Subject: 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 --- compiler/compiled_method.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler/compiled_method.cc') 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; -- cgit v1.2.3-59-g8ed1b