diff options
author | 2019-02-05 12:50:51 +0000 | |
---|---|---|
committer | 2019-02-05 12:50:51 +0000 | |
commit | 7909e1e4cc741b38b25328e2f9077beb7ecd018b (patch) | |
tree | b59583aa7e9d865d46c5bc8dec00729c649d4756 /compiler/jit/jit_compiler.cc | |
parent | ca3c6d9231aa8e4a9ca7c9040398d57f130441a0 (diff) | |
parent | 7f88c1a269754001bfcaf311b378cf1cc71acf84 (diff) |
Merge "ART: Enable ISA features run-time detection for ARM64"
Diffstat (limited to 'compiler/jit/jit_compiler.cc')
-rw-r--r-- | compiler/jit/jit_compiler.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc index 0d35fecb7b..4d7ae9bd1b 100644 --- a/compiler/jit/jit_compiler.cc +++ b/compiler/jit/jit_compiler.cc @@ -99,7 +99,10 @@ void JitCompiler::ParseCompilerOptions() { } } } + if (instruction_set_features == nullptr) { + // '--instruction-set-features/--instruction-set-variant' were not used. + // Use build-time defined features. instruction_set_features = InstructionSetFeatures::FromCppDefines(); } compiler_options_->instruction_set_features_ = std::move(instruction_set_features); |