From owner-svn-src-all@FreeBSD.ORG  Wed Aug 15 03:09:00 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E3DB6106566C;
	Wed, 15 Aug 2012 03:09:00 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CF2138FC18;
	Wed, 15 Aug 2012 03:09:00 +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 q7F390Hj091416;
	Wed, 15 Aug 2012 03:09:00 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7F390SM091412;
	Wed, 15 Aug 2012 03:09:00 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201208150309.q7F390SM091412@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Wed, 15 Aug 2012 03:09:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239271 - head/lib/libc/arm/gen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 15 Aug 2012 03:09:01 -0000

Author: gonzo
Date: Wed Aug 15 03:09:00 2012
New Revision: 239271
URL: http://svn.freebsd.org/changeset/base/239271

Log:
  Merging of projects/armv6, part 2
  
  Handle TLS for ARMv6 and ARMv7

Modified:
  head/lib/libc/arm/gen/__aeabi_read_tp.S
  head/lib/libc/arm/gen/_set_tp.c

Modified: head/lib/libc/arm/gen/__aeabi_read_tp.S
==============================================================================
--- head/lib/libc/arm/gen/__aeabi_read_tp.S	Wed Aug 15 03:08:29 2012	(r239270)
+++ head/lib/libc/arm/gen/__aeabi_read_tp.S	Wed Aug 15 03:09:00 2012	(r239271)
@@ -31,10 +31,16 @@ __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
 
+#ifdef ARM_TP_ADDRESS
 .Larm_tp_address:
 	.word ARM_TP_ADDRESS
+#endif
 

Modified: head/lib/libc/arm/gen/_set_tp.c
==============================================================================
--- head/lib/libc/arm/gen/_set_tp.c	Wed Aug 15 03:08:29 2012	(r239270)
+++ head/lib/libc/arm/gen/_set_tp.c	Wed Aug 15 03:09:00 2012	(r239271)
@@ -35,5 +35,9 @@ void
 _set_tp(void *tp)
 {
 
+#ifdef ARM_TP_ADDRESS
 	*((struct tcb **)ARM_TP_ADDRESS) = tp;
+#else
+	sysarch(ARM_SET_TP, tp);
+#endif
 }