From owner-p4-projects@FreeBSD.ORG  Fri Jul 14 05:24:15 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7474316A4E5; Fri, 14 Jul 2006 05:24:15 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 532D316A4E0
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:24:15 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 10B6B43D4C
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:24:15 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6E5OEID035281
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:24:14 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6E5OElT035278
	for perforce@freebsd.org; Fri, 14 Jul 2006 05:24:14 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 14 Jul 2006 05:24:14 GMT
Message-Id: <200607140524.k6E5OElT035278@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101518 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jul 2006 05:24:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=101518

Change 101518 by jb@jb_freebsd2 on 2006/07/14 05:23:34

	Allow for threads built into libc.

Affected files ...

.. //depot/projects/dtrace/src/tools/regression/tls/ttls2/Makefile#3 edit
.. //depot/projects/dtrace/src/tools/regression/tls/ttls3/Makefile#3 edit
.. //depot/projects/dtrace/src/tools/regression/tls/ttls4/Makefile#3 edit

Differences ...

==== //depot/projects/dtrace/src/tools/regression/tls/ttls2/Makefile#3 (text+ko) ====

@@ -1,8 +1,14 @@
 # $FreeBSD: src/tools/regression/tls/ttls2/Makefile,v 1.4 2004/12/21 08:47:25 ru Exp $
 
+.include <bsd.own.mk>
+
 PROG=	ttls2
-LDADD+= -lpthread
 NO_MAN=
 DEBUG_FLAGS= -g
 
+.if ${MK_LIBC_THREADS} == "no"
+DPADD+=	${LIBPTHREAD}
+LDADD+=	-lpthread
+.endif
+
 .include <bsd.prog.mk>

==== //depot/projects/dtrace/src/tools/regression/tls/ttls3/Makefile#3 (text+ko) ====

@@ -1,11 +1,16 @@
 # $FreeBSD: src/tools/regression/tls/ttls3/Makefile,v 1.2 2004/08/16 09:35:49 dfr Exp $
 
+.include <bsd.own.mk>
+
 all: ttls3
 
 LDFLAGS=-shared -Bsymbolic --allow-shlib-undefined
-CFLAGS+= -lpthread
 CFLAGS+= -Wl,--rpath=${.OBJDIR}
 
+.if ${MK_LIBC_THREADS} == "no"
+CFLAGS+=	-lpthread
+.endif
+
 tls-lib: elftls.S
 	gcc -c -o elftls.o ${.CURDIR}/elftls.S
 	ld $(LDFLAGS) elftls.o -soname libtls.so.1 -o libtls.so.1

==== //depot/projects/dtrace/src/tools/regression/tls/ttls4/Makefile#3 (text+ko) ====

@@ -1,8 +1,14 @@
 # $FreeBSD: src/tools/regression/tls/ttls4/Makefile,v 1.1 2005/04/23 23:47:58 davidxu Exp $
 
+.include <bsd.own.mk>
+
 PROG=	ttls4
-LDADD+=	-lpthread
 NO_MAN=
 DEBUG_FLAGS= -g
 
+.if ${MK_LIBC_THREADS} == "no"
+DPADD+=	${LIBPTHREAD}
+LDADD+=	-lpthread
+.endif
+
 .include <bsd.prog.mk>