From owner-p4-projects@FreeBSD.ORG  Wed Oct 17 02:19:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2241716A420; Wed, 17 Oct 2007 02:19:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DB7EE16A417
	for <perforce@freebsd.org>; Wed, 17 Oct 2007 02:19:22 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C5CF813C457
	for <perforce@freebsd.org>; Wed, 17 Oct 2007 02:19:22 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9H2JM5t070926
	for <perforce@freebsd.org>; Wed, 17 Oct 2007 02:19:22 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9H2JM3H070923
	for perforce@freebsd.org; Wed, 17 Oct 2007 02:19:22 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 17 Oct 2007 02:19:22 GMT
Message-Id: <200710170219.l9H2JM3H070923@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 127618 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, 17 Oct 2007 02:19:23 -0000

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

Change 127618 by jb@jb_freebsd1 on 2007/10/17 02:18:38

	IFopensolaris

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#8 integrate

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#8 (text) ====

@@ -86,6 +86,7 @@
 #define	DBG_DLSYM_DEFAULT	2
 #define	DBG_DLSYM_SELF		3
 #define	DBG_DLSYM_PROBE		4
+#define	DBG_DLSYM_SINGLETON	5
 
 #define	DBG_DLCLOSE_NULL	0
 #define	DBG_DLCLOSE_IGNORE	1
@@ -141,6 +142,11 @@
 #define	DBG_NL_STD		0	/* newline controllers - standard and */
 #define	DBG_NL_FRC		2	/*    forced. */
 
+#define	DBG_BNDREJ_NODIR	0	/* bind rejected, direct to nodirect */
+#define	DBG_BNDREJ_SINGLE	1	/* bind rejected, singleton without */
+					/*    default search model */
+#define	DBG_BNDREJ_NUM		DBG_BNDREJ_SINGLE
+
 /*
  * Define a debug descriptor, and a user macro that inspects the descriptor as
  * a means of triggering a class of diagnostic output.
@@ -205,6 +211,7 @@
 #define	Dbg_bind_plt_summary	Dbg64_bind_plt_summary
 #define	Dbg_bind_pltpad_from	Dbg64_bind_pltpad_from
 #define	Dbg_bind_pltpad_to	Dbg64_bind_pltpad_to
+#define	Dbg_bind_reject		Dbg64_bind_reject
 #define	Dbg_bind_weak		Dbg64_bind_weak
 
 #define	Dbg_cap_val_hw1		Dbg64_cap_val_hw1
@@ -403,6 +410,7 @@
 
 #define	Dbg_bind_global		Dbg32_bind_global
 #define	Dbg_bind_plt_summary	Dbg32_bind_plt_summary
+#define	Dbg_bind_reject		Dbg32_bind_reject
 #define	Dbg_bind_weak		Dbg32_bind_weak
 
 #define	Dbg_cap_val_hw1		Dbg32_cap_val_hw1
@@ -621,6 +629,7 @@
 extern	void	Dbg_bind_pltpad_from(Rt_map *, Addr, const char *);
 extern	void	Dbg_bind_pltpad_to(Rt_map *, Addr, const char *, const char *);
 #endif
+extern	void	Dbg_bind_reject(Rt_map *, Rt_map *, const char *, int);
 extern	void	Dbg_bind_weak(Rt_map *, Addr, Addr, const char *);
 
 extern	void	Dbg_cap_hw_candidate(Lm_list *, const char *);