diff options
| author | 2016-11-29 22:07:47 +0000 | |
|---|---|---|
| committer | 2016-11-29 22:07:48 +0000 | |
| commit | ae7f6b965e15794b0014a0c1db5e1fcf9e841e5c (patch) | |
| tree | 5410febb548c7970d3966325e38a14d7a7d89002 /compiler/utils/jni_macro_assembler.cc | |
| parent | ab191538a1d9eee6ec96bc3fa86dde36a007a6f5 (diff) | |
| parent | 6287c238a56ef32f6614484eb8ec9bcc9b726a8e (diff) | |
Merge "ARM: Fix JNI MacroAssembler after VIXL update."
Diffstat (limited to 'compiler/utils/jni_macro_assembler.cc')
| -rw-r--r-- | compiler/utils/jni_macro_assembler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/jni_macro_assembler.cc b/compiler/utils/jni_macro_assembler.cc index 1b743134ed..2f154fb862 100644 --- a/compiler/utils/jni_macro_assembler.cc +++ b/compiler/utils/jni_macro_assembler.cc @@ -20,7 +20,7 @@ #include <vector> #ifdef ART_ENABLE_CODEGEN_arm -#include "arm/jni_macro_assembler_arm.h" +#include "arm/jni_macro_assembler_arm_vixl.h" #endif #ifdef ART_ENABLE_CODEGEN_arm64 #include "arm64/jni_macro_assembler_arm64.h" @@ -58,7 +58,7 @@ MacroAsm32UniquePtr JNIMacroAssembler<PointerSize::k32>::Create( #ifdef ART_ENABLE_CODEGEN_arm case kArm: case kThumb2: - return MacroAsm32UniquePtr(new (arena) arm::ArmJNIMacroAssembler(arena, instruction_set)); + return MacroAsm32UniquePtr(new (arena) arm::ArmVIXLJNIMacroAssembler(arena)); #endif #ifdef ART_ENABLE_CODEGEN_mips case kMips: |