summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2013-08-11 23:35:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-11 23:35:26 -0700
commit284fcd1bb9d47e7d69c6573d2952ff36346b2b0d (patch)
treef68fc9746fa4ba784cb66064a0424cbe3e1f78ce
parent5d9b1d724eecc47369fc5d21f32179c40790feda (diff)
parentd8cf66be7fa0803b26508005cefb27e1498d2963 (diff)
downloadart-284fcd1bb9d47e7d69c6573d2952ff36346b2b0d.zip
art-284fcd1bb9d47e7d69c6573d2952ff36346b2b0d.tar.gz
art-284fcd1bb9d47e7d69c6573d2952ff36346b2b0d.tar.bz2
am d8cf66be: Place CFA in the regular .debug_frame section.
* commit 'd8cf66be7fa0803b26508005cefb27e1498d2963': Place CFA in the regular .debug_frame section.
-rw-r--r--runtime/arch/arm/jni_entrypoints_arm.S2
-rw-r--r--runtime/arch/arm/portable_entrypoints_arm.S2
-rw-r--r--runtime/arch/arm/quick_entrypoints_arm.S2
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/arch/arm/jni_entrypoints_arm.S b/runtime/arch/arm/jni_entrypoints_arm.S
index 322c40b..f51f121 100644
--- a/runtime/arch/arm/jni_entrypoints_arm.S
+++ b/runtime/arch/arm/jni_entrypoints_arm.S
@@ -16,6 +16,8 @@
#include "asm_support_arm.S"
+ .cfi_sections .debug_frame
+
/*
* Jni dlsym lookup stub.
*/
diff --git a/runtime/arch/arm/portable_entrypoints_arm.S b/runtime/arch/arm/portable_entrypoints_arm.S
index 9b1014a..adfd22b 100644
--- a/runtime/arch/arm/portable_entrypoints_arm.S
+++ b/runtime/arch/arm/portable_entrypoints_arm.S
@@ -16,6 +16,8 @@
#include "asm_support_arm.S"
+ .cfi_sections .debug_frame
+
/*
* Portable invocation stub.
* On entry:
diff --git a/runtime/arch/arm/quick_entrypoints_arm.S b/runtime/arch/arm/quick_entrypoints_arm.S
index e23f5a8..d9bb433 100644
--- a/runtime/arch/arm/quick_entrypoints_arm.S
+++ b/runtime/arch/arm/quick_entrypoints_arm.S
@@ -16,6 +16,8 @@
#include "asm_support_arm.S"
+ .cfi_sections .debug_frame
+
/* Deliver the given exception */
.extern artDeliverExceptionFromCode
/* Deliver an exception pending on a thread */