Fix MIPS32 mterp
Include .h instead of non-existing .S file. Also add
.cfi_startproc and .cfi_endproc directives for ExecuteMterpImpl.
This fixes aosp_mips-eng build.
Test: successful aosp_mips-eng build
Change-Id: Ifc7860cbb4155332ff5f6867824bc8e36ae3b6ae
diff --git a/runtime/interpreter/mterp/mips/entry.S b/runtime/interpreter/mterp/mips/entry.S
index 3908cb5..41b5d56 100644
--- a/runtime/interpreter/mterp/mips/entry.S
+++ b/runtime/interpreter/mterp/mips/entry.S
@@ -32,6 +32,7 @@
*/
ExecuteMterpImpl:
+ .cfi_startproc
.set noreorder
.cpload t9
.set reorder
diff --git a/runtime/interpreter/mterp/mips/footer.S b/runtime/interpreter/mterp/mips/footer.S
index 6e1ba1c..1c784ef 100644
--- a/runtime/interpreter/mterp/mips/footer.S
+++ b/runtime/interpreter/mterp/mips/footer.S
@@ -284,4 +284,5 @@
STACK_LOAD_FULL()
jalr zero, ra
+ .cfi_endproc
.end ExecuteMterpImpl
diff --git a/runtime/interpreter/mterp/mips/header.S b/runtime/interpreter/mterp/mips/header.S
index 1ccaa64..0f7a6f1 100644
--- a/runtime/interpreter/mterp/mips/header.S
+++ b/runtime/interpreter/mterp/mips/header.S
@@ -32,7 +32,7 @@
*/
#include "asm_support.h"
-#include "interpreter/mterp/cfi_asm_support.S"
+#include "interpreter/mterp/cfi_asm_support.h"
#if (__mips==32) && (__mips_isa_rev>=2)
#define MIPS32REVGE2 /* mips32r2 and greater */
diff --git a/runtime/interpreter/mterp/out/mterp_mips.S b/runtime/interpreter/mterp/out/mterp_mips.S
index 9535e25..1687afa 100644
--- a/runtime/interpreter/mterp/out/mterp_mips.S
+++ b/runtime/interpreter/mterp/out/mterp_mips.S
@@ -39,7 +39,7 @@
*/
#include "asm_support.h"
-#include "interpreter/mterp/cfi_asm_support.S"
+#include "interpreter/mterp/cfi_asm_support.h"
#if (__mips==32) && (__mips_isa_rev>=2)
#define MIPS32REVGE2 /* mips32r2 and greater */
@@ -766,6 +766,7 @@
*/
ExecuteMterpImpl:
+ .cfi_startproc
.set noreorder
.cpload t9
.set reorder
@@ -12844,5 +12845,6 @@
STACK_LOAD_FULL()
jalr zero, ra
+ .cfi_endproc
.end ExecuteMterpImpl