PERFORCE change 101518 for review

[John Birrell]

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

Change 101518 by jb at 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>