From b8397a6eebd3b71bd8caea133cf0ad23a07bfcff Mon Sep 17 00:00:00 2001
From: Geoff Norton <grompf@sublimeintervention.com>
Date: Thu, 10 Mar 2011 16:27:54 -0500
Subject: [PATCH] Fix ARCH_STORE_REGS on arm

---
 mono/metadata/sgen-archdep.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/mono/metadata/sgen-archdep.h b/mono/metadata/sgen-archdep.h
index a1e3e6d2f9f..020eb39b842 100644
--- a/mono/metadata/sgen-archdep.h
+++ b/mono/metadata/sgen-archdep.h
@@ -136,15 +136,14 @@
 
 /* We dont store ip, sp */
 #define ARCH_NUM_REGS 14
-#define ARCH_STORE_REGS(ptr)				\
-	__asm__ __volatile__(				\
+#define ARCH_STORE_REGS(ptr)		\
+	__asm__ __volatile__(			\
 		"push {lr}\n"				\
-		"ldr lr, %0\n"				\
-		"stmia lr!, {r0-r12}\n"			\
-		"mov r12, r0\n"				\
+		"mov lr, %0\n"				\
+		"stmia lr!, {r0-r12}\n"		\
 		"pop {lr}\n"				\
-		: 					\
-		: "m" (ptr)				\
+		:							\
+		: "r" (ptr)					\
 	)
 
 #define ARCH_SIGCTX_SP(ctx)	(UCONTEXT_REG_SP((ctx)))
-- 
2.11.4.GIT