3 files changed, 12 insertions, 1 deletions
diff --git a/vm/compiler/codegen/arm/Assemble.c b/vm/compiler/codegen/arm/Assemble.c
index efae8fd37..8f62b1e14 100644
--- a/vm/compiler/codegen/arm/Assemble.c
+++ b/vm/compiler/codegen/arm/Assemble.c
@@ -1989,7 +1989,8 @@ static int dumpTraceProfile(JitEntry *p, bool silent, bool reset,
 JitTraceDescription *dvmCopyTraceDescriptor(const u2 *pc,
                                             const JitEntry *knownEntry)
 {
-    const JitEntry *jitEntry = knownEntry ? knownEntry : dvmFindJitEntry(pc);
+    const JitEntry *jitEntry = knownEntry ? knownEntry
+                                          : dvmJitFindEntry(pc, false);
     if (jitEntry == NULL) return NULL;
 
     /* Find out the startint point */
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c
index fb7e30e81..1b7c6ed02 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.c
+++ b/vm/compiler/codegen/arm/CodegenDriver.c
@@ -4540,6 +4540,11 @@ void *dvmCompilerGetInterpretTemplate()
                       templateEntryOffsets[TEMPLATE_INTERPRET]);
 }
 
+JitInstructionSetType dvmCompilerGetInterpretTemplateSet()
+{
+    return DALVIK_JIT_ARM;
+}
+
 /* Needed by the Assembler */
 void dvmCompilerSetupResourceMasks(ArmLIR *lir)
 {
diff --git a/vm/compiler/codegen/x86/CodegenDriver.c b/vm/compiler/codegen/x86/CodegenDriver.c
index 4f31563ea..e440e37ab 100644
--- a/vm/compiler/codegen/x86/CodegenDriver.c
+++ b/vm/compiler/codegen/x86/CodegenDriver.c
@@ -303,6 +303,11 @@ void *dvmCompilerGetInterpretTemplate()
                       templateEntryOffsets[TEMPLATE_INTERPRET]);
 }
 
+JitInstructionSetType dvmCompilerGetInterpretTemplateSet()
+{
+    return DALVIK_JIT_X86;
+}
+
 void dvmCompilerInitializeRegAlloc(CompilationUnit *cUnit)
 {
 }