From owner-svn-src-projects@FreeBSD.ORG  Tue May 15 12:08:52 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2ABA9106566B;
	Tue, 15 May 2012 12:08:52 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 161678FC08;
	Tue, 15 May 2012 12:08:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4FC8pba087130;
	Tue, 15 May 2012 12:08:51 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4FC8pXT087129;
	Tue, 15 May 2012 12:08:51 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201205151208.q4FC8pXT087129@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Tue, 15 May 2012 12:08:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235472 - projects/armv6/lib/libc/arm/gen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 May 2012 12:08:52 -0000

Author: cognet
Date: Tue May 15 12:08:51 2012
New Revision: 235472
URL: http://svn.freebsd.org/changeset/base/235472

Log:
  Implement __aeabi_read_tp for armv6/7 as well

Modified:
  projects/armv6/lib/libc/arm/gen/__aeabi_read_tp.S

Modified: projects/armv6/lib/libc/arm/gen/__aeabi_read_tp.S
==============================================================================
--- projects/armv6/lib/libc/arm/gen/__aeabi_read_tp.S	Tue May 15 10:58:17 2012	(r235471)
+++ projects/armv6/lib/libc/arm/gen/__aeabi_read_tp.S	Tue May 15 12:08:51 2012	(r235472)
@@ -31,8 +31,12 @@ __FBSDID("$FreeBSD$");
 #include <machine/sysarch.h>
 
 ENTRY(__aeabi_read_tp)
+#ifdef ARM_TP_ADDRESS
 	ldr	r0, .Larm_tp_address
 	ldr	r0, [r0]
+#else
+	mrc	p15, 0, r0, c13, c0, 3
+#endif
 	RET
 
 .Larm_tp_address: