diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-08-08 19:39:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-08 19:39:51 +0000 |
| commit | c0362b5f93a2d5d34f8a660804920dbb236ad625 (patch) | |
| tree | bc093f1e8a85c0d5201cbf541489a0ff5da33026 /compiler/utils/jni_macro_assembler.cc | |
| parent | af2962caff1a13ef3a9b3deb3f2e1c9bbdc5aed3 (diff) | |
| parent | 9954e3b2fe94bf46100183e39478bc57b3a212a1 (diff) | |
Merge "ART: Extract JNI macro assembler for x86"
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 0b1aa08a17..1acc90ca6f 100644 --- a/compiler/utils/jni_macro_assembler.cc +++ b/compiler/utils/jni_macro_assembler.cc @@ -33,7 +33,7 @@ #include "mips64/assembler_mips64.h" #endif #ifdef ART_ENABLE_CODEGEN_x86 -#include "x86/assembler_x86.h" +#include "x86/jni_macro_assembler_x86.h" #endif #ifdef ART_ENABLE_CODEGEN_x86_64 #include "x86_64/jni_macro_assembler_x86_64.h" @@ -72,7 +72,7 @@ MacroAsm32UniquePtr JNIMacroAssembler<PointerSize::k32>::Create( #endif #ifdef ART_ENABLE_CODEGEN_x86 case kX86: - return MacroAsm32UniquePtr(new (arena) x86::X86Assembler(arena)); + return MacroAsm32UniquePtr(new (arena) x86::X86JNIMacroAssembler(arena)); #endif default: LOG(FATAL) << "Unknown/unsupported 4B InstructionSet: " << instruction_set; |