From owner-svn-src-stable-9@FreeBSD.ORG  Thu Jun 21 13:53:29 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 40FEC106566B;
	Thu, 21 Jun 2012 13:53:29 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AFE48FC15;
	Thu, 21 Jun 2012 13:53:29 +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 q5LDrT05016507;
	Thu, 21 Jun 2012 13:53:29 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5LDrSxI016504;
	Thu, 21 Jun 2012 13:53:28 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201206211353.q5LDrSxI016504@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 21 Jun 2012 13:53:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237397 - in stable/9/lib/libthr/arch/arm: arm include
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jun 2012 13:53:29 -0000

Author: marius
Date: Thu Jun 21 13:53:28 2012
New Revision: 237397
URL: http://svn.freebsd.org/changeset/base/237397

Log:
  MFC: r231619
  
  Add thread-local storage support for arm:
  
  - Switch to Variant I TCB layout
  - Use function from rtld for TCB allocation/deallocation

Modified:
  stable/9/lib/libthr/arch/arm/arm/pthread_md.c
  stable/9/lib/libthr/arch/arm/include/pthread_md.h
Directory Properties:
  stable/9/lib/libthr/   (props changed)

Modified: stable/9/lib/libthr/arch/arm/arm/pthread_md.c
==============================================================================
--- stable/9/lib/libthr/arch/arm/arm/pthread_md.c	Thu Jun 21 13:51:50 2012	(r237396)
+++ stable/9/lib/libthr/arch/arm/arm/pthread_md.c	Thu Jun 21 13:53:28 2012	(r237397)
@@ -37,14 +37,17 @@ _tcb_ctor(struct pthread *thread, int in
 {
 	struct tcb *tcb;
 
-	tcb = malloc(sizeof(struct tcb));
+	tcb = _rtld_allocate_tls((initial) ? _tcb_get() :  NULL,
+	    sizeof(struct tcb), 16);
 	if (tcb)
 		tcb->tcb_thread = thread;
+
 	return (tcb);
 }
 
 void
 _tcb_dtor(struct tcb *tcb)
 {
-	free(tcb);
+
+	_rtld_free_tls(tcb, sizeof(struct tcb), 16);
 }

Modified: stable/9/lib/libthr/arch/arm/include/pthread_md.h
==============================================================================
--- stable/9/lib/libthr/arch/arm/include/pthread_md.h	Thu Jun 21 13:51:50 2012	(r237396)
+++ stable/9/lib/libthr/arch/arm/include/pthread_md.h	Thu Jun 21 13:53:28 2012	(r237397)
@@ -43,10 +43,8 @@
  * Variant II tcb, first two members are required by rtld.
  */
 struct tcb {
-	struct tcb		*tcb_self;	/* required by rtld */
 	void			*tcb_dtv;	/* required by rtld */
 	struct pthread		*tcb_thread;	/* our hook */
-	void			*tcb_spare[1];
 };
 
 /*