summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Turner <andrew@FreeBSD.org>2015-01-31 19:55:12 +0000
committerAndrew Turner <andrew@FreeBSD.org>2015-01-31 19:55:12 +0000
commit8e35ef81cc6aae36cd63a4243cf891c94e95ba4c (patch)
treef6883154eddc9bc0901e7905bb4347595b43ef2b
parent878eae988b9cfe8cd81dd87d33ed86d8bb077988 (diff)
Notes
-rw-r--r--sys/arm/include/profile.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/arm/include/profile.h b/sys/arm/include/profile.h
index c465ba655ee6..a28f33e90d3b 100644
--- a/sys/arm/include/profile.h
+++ b/sys/arm/include/profile.h
@@ -86,7 +86,12 @@ typedef u_long fptrdiff_t;
/* \
* Restore registers that were trashed during mcount \
*/ \
- __asm__("ldmfd sp!, {r0-r3, lr, pc}");
+ __asm__("ldmfd sp!, {r0-r3, lr}"); \
+ /* \
+ * Return to the caller. Loading lr and pc in one instruction \
+ * is deprecated on ARMv7 so we need this on it's own. \
+ */ \
+ __asm__("ldmfd sp!, {pc}");
void bintr(void);
void btrap(void);
void eintr(void);