svn commit: r248124 - head/sys/arm/arm

[Andrew Turner]

Author: andrew
Date: Sun Mar 10 02:40:50 2013
New Revision: 248124
URL: http://svnweb.freebsd.org/changeset/base/248124

Log:
  Update how we read the stack pointer to work on both GCC and clang.

Modified:
  head/sys/arm/arm/db_trace.c

Modified: head/sys/arm/arm/db_trace.c
==============================================================================
--- head/sys/arm/arm/db_trace.c	Sun Mar 10 02:38:35 2013	(r248123)
+++ head/sys/arm/arm/db_trace.c	Sun Mar 10 02:40:50 2013	(r248124)
@@ -612,10 +612,13 @@ db_trace_self(void)
 {
 #ifdef __ARM_EABI__
 	struct unwind_state state;
-	register uint32_t sp __asm__ ("sp");
+	uint32_t sp;
+
+	/* Read the stack pointer */
+	__asm __volatile("mov %0, sp" : "=&r" (sp));
 
 	state.registers[FP] = (uint32_t)__builtin_frame_address(0);
-	state.registers[SP] = (uint32_t)sp;
+	state.registers[SP] = sp;
 	state.registers[LR] = (uint32_t)__builtin_return_address(0);
 	state.registers[PC] = (uint32_t)db_trace_self;