diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-08-08 19:38:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-08 19:38:53 +0000 |
| commit | af2962caff1a13ef3a9b3deb3f2e1c9bbdc5aed3 (patch) | |
| tree | 147b8b9c74241b734111634b9f1add9fbd30c256 /compiler/utils/jni_macro_assembler.cc | |
| parent | 2f8d19f299274ffe6279044d885d10fa14cf127d (diff) | |
| parent | 1ace16bfe8727430809f1e83745e13c52f9610cd (diff) | |
Merge "ART: Extract JNI macro assembler for x86-64"
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 6c14888293..0b1aa08a17 100644 --- a/compiler/utils/jni_macro_assembler.cc +++ b/compiler/utils/jni_macro_assembler.cc @@ -36,7 +36,7 @@ #include "x86/assembler_x86.h" #endif #ifdef ART_ENABLE_CODEGEN_x86_64 -#include "x86_64/assembler_x86_64.h" +#include "x86_64/jni_macro_assembler_x86_64.h" #endif #include "base/casts.h" #include "globals.h" @@ -98,7 +98,7 @@ MacroAsm64UniquePtr JNIMacroAssembler<PointerSize::k64>::Create( #endif #ifdef ART_ENABLE_CODEGEN_x86_64 case kX86_64: - return MacroAsm64UniquePtr(new (arena) x86_64::X86_64Assembler(arena)); + return MacroAsm64UniquePtr(new (arena) x86_64::X86_64JNIMacroAssembler(arena)); #endif default: LOG(FATAL) << "Unknown/unsupported 8B InstructionSet: " << instruction_set; |