diff options
| author | Dmitry Petrochenko <dmitry.petrochenko@intel.com> | 2014-04-02 17:27:59 +0700 |
|---|---|---|
| committer | Dmitry Petrochenko <dmitry.petrochenko@intel.com> | 2014-04-03 13:06:55 +0700 |
| commit | 6a58cb16d803c9a7b3a75ccac8be19dd9d4e520d (patch) | |
| tree | c142777f40178fd9b9090cd7316be694befb3f21 /compiler/compilers.cc | |
| parent | 8549cf9d83688f7decbbea2a8de761ce29e95f3c (diff) | |
| download | android_art-6a58cb16d803c9a7b3a75ccac8be19dd9d4e520d.tar.gz android_art-6a58cb16d803c9a7b3a75ccac8be19dd9d4e520d.tar.bz2 android_art-6a58cb16d803c9a7b3a75ccac8be19dd9d4e520d.zip | |
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 <dmitry.petrochenko@intel.com>
Diffstat (limited to 'compiler/compilers.cc')
| -rw-r--r-- | compiler/compilers.cc | 6 |
1 files changed, 6 insertions, 0 deletions
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<uint8_t>* QuickCompiler::GetCallFrameInformationInitialization( if (driver.GetInstructionSet() == kX86) { return X86CFIInitialization(); } + if (driver.GetInstructionSet() == kX86_64) { + return X86CFIInitialization(); + } return nullptr; } |