From owner-p4-projects@FreeBSD.ORG  Wed May 31 02:39:19 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 9B40316B138; Wed, 31 May 2006 02:39:19 +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 71A0716AE1D
	for <perforce@freebsd.org>; Wed, 31 May 2006 02:39:19 +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 8AA7B43D72
	for <perforce@freebsd.org>; Wed, 31 May 2006 02:39:18 +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 k4V2bwQN013238
	for <perforce@freebsd.org>; Wed, 31 May 2006 02:37:58 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V2bwv1013235
	for perforce@freebsd.org; Wed, 31 May 2006 02:37:58 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 31 May 2006 02:37:58 GMT
Message-Id: <200605310237.k4V2bwv1013235@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 98182 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: Wed, 31 May 2006 02:39:19 -0000

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

Change 98182 by jb@jb_freebsd2 on 2006/05/31 02:37:48

	Comment out a couple off asserts on FreeBSD because the statements need
	non-standard functions that we can put in current's libpthread, but
	which cause problems upgrading from RELENG_6.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getdata.c#3 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getdata.c#3 (text) ====

@@ -127,8 +127,10 @@
 	Elf_Data	src;
 	unsigned	work;
 
+#if defined(sun)
 	assert(!elf_threaded || RW_LOCK_HELD(&(scn->s_elf->ed_rwlock)));
 	assert(!elf_threaded || MUTEX_HELD(&(scn->s_mutex)));
+#endif
 	elf = scn->s_elf;
 
 	if ((scn->s_myflags & SF_READY) == 0) {