diff options
| author | Artem Serov <artem.serov@linaro.org> | 2016-08-08 15:14:18 +0100 |
|---|---|---|
| committer | Artem Serov <artem.serov@linaro.org> | 2016-08-19 15:53:04 +0100 |
| commit | f77d156168496b9793d893980123efd0ad38d5ee (patch) | |
| tree | 9f06af1cf240eb851ee5a707d0688ebfa612b100 /compiler/utils/jni_macro_assembler.cc | |
| parent | 12e097c84cef710fa4f254b1811ff70b876e9e9a (diff) | |
ARM: VIXL32: Switch JNI compiler to use VIXL Assembler.
Change-Id: I9f9ef1a9c9c9eb796d52980916e56e841aa52a0f
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 797a98cfd5..4bbd275eba 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: |