Stop using load-multiple with lr and pc. This has been deprecated in ARMv7

and clang 3.6 warns about it. As this is used in libc and we build it with
-Werror this warning becomes an error stopping the build.

1 files changed, 6 insertions, 1 deletions

diff --git a/sys/arm/include/profile.h b/sys/arm/include/profile.h
index c465ba6..a28f33e 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);