From owner-p4-projects@FreeBSD.ORG  Fri Jul 14 22:45:46 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 0910216A503; Fri, 14 Jul 2006 22:45:46 +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 CA9F516A500
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 22:45:45 +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 9863043D45
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 22:45:45 +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 k6EMjjra055568
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 22:45:45 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6EMjjdB055562
	for perforce@freebsd.org; Fri, 14 Jul 2006 22:45:45 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 14 Jul 2006 22:45:45 GMT
Message-Id: <200607142245.k6EMjjdB055562@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 101619 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 22:45:46 -0000

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

Change 101619 by jb@jb_freebsd2 on 2006/07/14 22:45:25

	Allow this file to be compiled into libc.

Affected files ...

.. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#5 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#5 (text+ko) ====

@@ -119,6 +119,7 @@
 static void init_private(void);
 static void init_main_thread(struct pthread *thread);
 
+#ifndef LIBC_THREADS
 /*
  * All weak references used within libc should be in this table.
  * This is so that static libraries will work.
@@ -246,6 +247,7 @@
 	{DUAL_ENTRY(_pthread_sigmask)},		/* PJT_SIGMASK */
 	{DUAL_ENTRY(_pthread_testcancel)}	/* PJT_TESTCANCEL */
 };
+#endif
 
 static int init_once = 0;
 
@@ -292,6 +294,7 @@
 		/* Only initialize the threaded application once. */
 		return;
 
+#ifndef LIBC_THREADS
 	/*
 	 * Check the size of the jump table to make sure it is preset
 	 * with the correct number of entries.
@@ -299,6 +302,7 @@
 	if (sizeof(jmp_table) != (sizeof(pthread_func_t) * PJT_MAX * 2))
 		PANIC("Thread jump table not properly initialized");
 	memcpy(__thr_jtable, jmp_table, sizeof(jmp_table));
+#endif
 
 	/*
 	 * Check for the special case of this process running as