diff options
author | 2015-02-24 16:55:04 +0100 | |
---|---|---|
committer | 2015-03-06 13:05:47 -0800 | |
commit | 6ea651f0f4c7de4580beb2e887d86802c1ae0738 (patch) | |
tree | fd97dcbd7301892cb785ca34aee21ad86437c3b3 /compiler/driver/compiler_driver.cc | |
parent | 0e242b5cad3c0b68b72f28c1e5fd3fdd4c05bfd8 (diff) |
Initial support for quick compiler on MIPS64r6.
Change-Id: I6f43027b84e4a98ea320cddb972d9cf39bf7c4f8
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
-rw-r--r-- | compiler/driver/compiler_driver.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index df2b520b50..6d2ef158e2 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -2184,8 +2184,10 @@ void CompilerDriver::CompileMethod(Thread* self, const DexFile::CodeItem* code_i InstructionSetHasGenericJniStub(instruction_set_)) { // Leaving this empty will trigger the generic JNI version } else { - compiled_method = compiler_->JniCompile(access_flags, method_idx, dex_file); - CHECK(compiled_method != nullptr); + if (instruction_set_ != kMips64) { // Use generic JNI for Mips64 (temporarily). + compiled_method = compiler_->JniCompile(access_flags, method_idx, dex_file); + CHECK(compiled_method != nullptr); + } } } else if ((access_flags & kAccAbstract) != 0) { // Abstract methods don't have code. |