From owner-svn-src-projects@FreeBSD.ORG  Mon Apr  9 21:29:58 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C52171065672;
	Mon,  9 Apr 2012 21:29:58 +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 B17EE8FC0A;
	Mon,  9 Apr 2012 21:29:58 +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 q39LTwv1079298;
	Mon, 9 Apr 2012 21:29:58 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q39LTwQX079296;
	Mon, 9 Apr 2012 21:29:58 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201204092129.q39LTwQX079296@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Mon, 9 Apr 2012 21:29:58 +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: r234071 - projects/armv6/libexec/rtld-elf/arm
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: Mon, 09 Apr 2012 21:29:58 -0000

Author: cognet
Date: Mon Apr  9 21:29:58 2012
New Revision: 234071
URL: http://svn.freebsd.org/changeset/base/234071

Log:
  I forgot this file when committing the new TLS bits for arm, so implement both
  the old and the new method here too.

Modified:
  projects/armv6/libexec/rtld-elf/arm/reloc.c

Modified: projects/armv6/libexec/rtld-elf/arm/reloc.c
==============================================================================
--- projects/armv6/libexec/rtld-elf/arm/reloc.c	Mon Apr  9 20:59:14 2012	(r234070)
+++ projects/armv6/libexec/rtld-elf/arm/reloc.c	Mon Apr  9 21:29:58 2012	(r234071)
@@ -429,7 +429,9 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr 
 void
 allocate_initial_tls(Obj_Entry *objs)
 {
+#ifdef ARM_TP_ADDRESS
 	void **_tp = (void **)ARM_TP_ADDRESS;
+#endif
 
 	/*
 	* Fix the size of the static TLS block by using the maximum
@@ -439,16 +441,27 @@ allocate_initial_tls(Obj_Entry *objs)
 
 	tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA;
 
+#ifdef ARM_TP_ADDRESS
 	(*_tp) = (void *) allocate_tls(objs, NULL, TLS_TCB_SIZE, 8);
+#else
+	sysarch(ARM_SET_TP, allocate_tls(objs, NULL, TLS_TCB_SIZE, 8));
+#endif
 }
 
 void *
 __tls_get_addr(tls_index* ti)
 {
-	void **_tp = (void **)ARM_TP_ADDRESS;
 	char *p;
+#ifdef ARM_TP_ADDRESS
+	void **_tp = (void **)ARM_TP_ADDRESS;
 
 	p = tls_get_addr_common((Elf_Addr **)(*_tp), ti->ti_module, ti->ti_offset);
+#else
+	void *_tp;
+	__asm __volatile("mrc  p15, 0, %0, c13, c0, 3"		\
+	    : "=r" (_tp));
+	p = tls_get_addr_common((Elf_Addr **)(_tp), ti->ti_module, ti->ti_offset);
+#endif
 
 	return (p);
 }