From 6a58cb16d803c9a7b3a75ccac8be19dd9d4e520d Mon Sep 17 00:00:00 2001 From: Dmitry Petrochenko Date: Wed, 2 Apr 2014 17:27:59 +0700 Subject: art: Handle x86_64 architecture equal to x86 This patch forces FE/ME to treat x86_64 as x86 exactly. The x86_64 logic will be revised later when assembly will be ready. Change-Id: I4a92477a6eeaa9a11fd710d35c602d8d6f88cbb6 Signed-off-by: Dmitry Petrochenko --- compiler/compilers.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'compiler/compilers.cc') diff --git a/compiler/compilers.cc b/compiler/compilers.cc index f58b38b570..1237e7019a 100644 --- a/compiler/compilers.cc +++ b/compiler/compilers.cc @@ -107,6 +107,9 @@ Backend* QuickCompiler::GetCodeGenerator(CompilationUnit* cu, void* compilation_ case kX86: mir_to_lir = X86CodeGenerator(cu, cu->mir_graph.get(), &cu->arena); break; + case kX86_64: + mir_to_lir = X86CodeGenerator(cu, cu->mir_graph.get(), &cu->arena); + break; default: LOG(FATAL) << "Unexpected instruction set: " << cu->instruction_set; } @@ -125,6 +128,9 @@ std::vector* QuickCompiler::GetCallFrameInformationInitialization( if (driver.GetInstructionSet() == kX86) { return X86CFIInitialization(); } + if (driver.GetInstructionSet() == kX86_64) { + return X86CFIInitialization(); + } return nullptr; } -- cgit v1.2.3