diff options
| author | 2014-06-05 19:47:18 +0000 | |
|---|---|---|
| committer | 2014-06-05 19:47:18 +0000 | |
| commit | 0eb3e752b65ef908e3790d81fae57cd85a41006b (patch) | |
| tree | 0378d281508f1f1b05e6463d80fceeba4d91eb16 /compiler/jni/quick/jni_compiler.cc | |
| parent | 7ce610516242b1ffd47a42bfc31c2d562f443ca6 (diff) | |
| parent | 65fcc2cf3c5cd97b84330c094908f3a6a7a8d4e7 (diff) | |
Merge "Thumb2 assembler for JNI compiler and optimizing compiler"
Diffstat (limited to 'compiler/jni/quick/jni_compiler.cc')
| -rw-r--r-- | compiler/jni/quick/jni_compiler.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index 7664a7f635..3bbb723bcf 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -17,6 +17,7 @@ #include <algorithm> #include <memory> #include <vector> +#include <fstream> #include "base/logging.h" #include "base/macros.h" @@ -61,9 +62,6 @@ CompiledMethod* ArtJniCompileMethodInternal(CompilerDriver* driver, const bool is_synchronized = (access_flags & kAccSynchronized) != 0; const char* shorty = dex_file.GetMethodShorty(dex_file.GetMethodId(method_idx)); InstructionSet instruction_set = driver->GetInstructionSet(); - if (instruction_set == kThumb2) { - instruction_set = kArm; - } const bool is_64_bit_target = Is64BitInstructionSet(instruction_set); // Calling conventions used to iterate over parameters to method std::unique_ptr<JniCallingConvention> main_jni_conv( |