diff options
| author | Elena Sayapina <elena.v.sayapina@intel.com> | 2014-07-01 18:39:52 +0700 |
|---|---|---|
| committer | Elena V Sayapina <elena.v.sayapina@intel.com> | 2014-07-02 06:14:07 +0000 |
| commit | dd64450b37776f68b9bfc47f8d9a88bc72c95727 (patch) | |
| tree | b9d823dc406be3d68fe903b7644052fbf5d66e62 /compiler/compilers.cc | |
| parent | 8b11544881ad6c8aeb50ba7c6a594363c2b684ec (diff) | |
| download | art-dd64450b37776f68b9bfc47f8d9a88bc72c95727.tar.gz art-dd64450b37776f68b9bfc47f8d9a88bc72c95727.tar.bz2 art-dd64450b37776f68b9bfc47f8d9a88bc72c95727.zip | |
x86_64: Unify 64-bit check in x86 compiler
Update x86-specific Gen64Bit() check with the CompilationUnit target64 field
which is set using unified Is64BitInstructionSet(InstructionSet) check.
Change-Id: Ic00ac863ed19e4543d7ea878d6c6c76d0bd85ce8
Signed-off-by: Elena Sayapina <elena.v.sayapina@intel.com>
Diffstat (limited to 'compiler/compilers.cc')
| -rw-r--r-- | compiler/compilers.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/compilers.cc b/compiler/compilers.cc index 76838d701b..f940b54f22 100644 --- a/compiler/compilers.cc +++ b/compiler/compilers.cc @@ -108,10 +108,9 @@ Backend* QuickCompiler::GetCodeGenerator(CompilationUnit* cu, void* compilation_ mir_to_lir = MipsCodeGenerator(cu, cu->mir_graph.get(), &cu->arena); break; case kX86: - mir_to_lir = X86CodeGenerator(cu, cu->mir_graph.get(), &cu->arena); - break; + // Fall-through. case kX86_64: - mir_to_lir = X86_64CodeGenerator(cu, cu->mir_graph.get(), &cu->arena); + mir_to_lir = X86CodeGenerator(cu, cu->mir_graph.get(), &cu->arena); break; default: LOG(FATAL) << "Unexpected instruction set: " << cu->instruction_set; |