diff options
| author | Andreas Gampe <agampe@google.com> | 2015-01-15 19:34:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-15 19:34:26 +0000 |
| commit | 0223a19fa4fc39ba89de2b87b03b98a5fd97778b (patch) | |
| tree | 0d1fdc9eb33ba27ec5fcb784ac8fee794936d8ce /compiler/driver/compiler_driver.cc | |
| parent | 726078d229fdb2857f3d8794fa50783f571cb7a2 (diff) | |
| parent | 57b34294758e9c00993913ebe43c7ee4698a5cc6 (diff) | |
| download | android_art-0223a19fa4fc39ba89de2b87b03b98a5fd97778b.tar.gz android_art-0223a19fa4fc39ba89de2b87b03b98a5fd97778b.tar.bz2 android_art-0223a19fa4fc39ba89de2b87b03b98a5fd97778b.zip | |
Merge "ART: Allow to compile interpret-only mips64 files"
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index e37180768a..56bed39bf1 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -365,7 +365,7 @@ CompilerDriver::CompilerDriver(const CompilerOptions* compiler_options, dump_cfg_file_name_(dump_cfg_file_name), timings_logger_(timer), compiler_context_(nullptr), - support_boot_image_fixup_(instruction_set != kMips), + support_boot_image_fixup_(instruction_set != kMips && instruction_set != kMips64), dedupe_code_("dedupe code", *swap_space_allocator_), dedupe_src_mapping_table_("dedupe source mapping table", *swap_space_allocator_), dedupe_mapping_table_("dedupe mapping table", *swap_space_allocator_), @@ -2096,6 +2096,7 @@ static bool InstructionSetHasGenericJniStub(InstructionSet isa) { case kArm64: case kThumb2: case kMips: + case kMips64: case kX86: case kX86_64: return true; default: return false; |