diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-08-09 22:23:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-09 22:23:25 +0000 |
| commit | c21f1c5b293a2830ef4a06f032cebd98d9596d4a (patch) | |
| tree | 6058568ff7b1d8fe7fb2989ff5e0d7e7501a610d /compiler/utils/jni_macro_assembler.cc | |
| parent | 0ed44f95955f48b21763dd32cbd510886e9bb2e1 (diff) | |
| parent | dcf3014718d9542927a4c8dc93701ce892484c84 (diff) | |
Merge "ART: Extract JNI macro assembler for arm64"
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 1acc90ca6f..4fca4e1090 100644 --- a/compiler/utils/jni_macro_assembler.cc +++ b/compiler/utils/jni_macro_assembler.cc @@ -24,7 +24,7 @@ #include "arm/assembler_thumb2.h" #endif #ifdef ART_ENABLE_CODEGEN_arm64 -#include "arm64/assembler_arm64.h" +#include "arm64/jni_macro_assembler_arm64.h" #endif #ifdef ART_ENABLE_CODEGEN_mips #include "mips/assembler_mips.h" @@ -90,7 +90,7 @@ MacroAsm64UniquePtr JNIMacroAssembler<PointerSize::k64>::Create( switch (instruction_set) { #ifdef ART_ENABLE_CODEGEN_arm64 case kArm64: - return MacroAsm64UniquePtr(new (arena) arm64::Arm64Assembler(arena)); + return MacroAsm64UniquePtr(new (arena) arm64::Arm64JNIMacroAssembler(arena)); #endif #ifdef ART_ENABLE_CODEGEN_mips64 case kMips64: |