From owner-svn-src-all@FreeBSD.ORG  Sun Mar 10 02:40:50 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E5CB66D4;
 Sun, 10 Mar 2013 02:40:50 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D6D4A7AA;
 Sun, 10 Mar 2013 02:40:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2A2eoUB013203;
 Sun, 10 Mar 2013 02:40:50 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2A2eo2t013202;
 Sun, 10 Mar 2013 02:40:50 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201303100240.r2A2eo2t013202@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 10 Mar 2013 02:40:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248124 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Mar 2013 02:40:51 -0000

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;