diff options
| author | 2017-09-19 15:29:07 +0000 | |
|---|---|---|
| committer | 2017-09-19 15:29:07 +0000 | |
| commit | 08601a494e87dfba9b06f9fdea37c9342e4896d1 (patch) | |
| tree | ed88da37b072b8e65d61373068912f00924b1f54 /compiler/optimizing/optimizing_compiler.cc | |
| parent | 216ba99075c650822585b92c37161aabd45f74a0 (diff) | |
| parent | 217d6d3cd0b78966178ab93cd221dbb2865048ee (diff) | |
Merge changes I38b16291,I159669ec
* changes:
ART: Remove old code
ART: Move read barrier config out of globals
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 73b0fa2bfa..e128a15cfd 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -434,9 +434,9 @@ bool OptimizingCompiler::CanCompileMethod(uint32_t method_idx ATTRIBUTE_UNUSED, } static bool IsInstructionSetSupported(InstructionSet instruction_set) { - return (instruction_set == kArm && !kArm32QuickCodeUseSoftFloat) + return instruction_set == kArm || instruction_set == kArm64 - || (instruction_set == kThumb2 && !kArm32QuickCodeUseSoftFloat) + || instruction_set == kThumb2 || instruction_set == kMips || instruction_set == kMips64 || instruction_set == kX86 |