From owner-p4-projects@FreeBSD.ORG  Tue Jun 20 07:45:39 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 219FD16A47F; Tue, 20 Jun 2006 07:45:39 +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 F122716A47C
	for <perforce@freebsd.org>; Tue, 20 Jun 2006 07:45:38 +0000 (UTC)
	(envelope-from lawrance@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ADE5E43D48
	for <perforce@freebsd.org>; Tue, 20 Jun 2006 07:45:38 +0000 (GMT)
	(envelope-from lawrance@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 k5K7jclm079916
	for <perforce@freebsd.org>; Tue, 20 Jun 2006 07:45:38 GMT
	(envelope-from lawrance@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5K7jcmP079913
	for perforce@freebsd.org; Tue, 20 Jun 2006 07:45:38 GMT
	(envelope-from lawrance@freebsd.org)
Date: Tue, 20 Jun 2006 07:45:38 GMT
Message-Id: <200606200745.k5K7jcmP079913@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lawrance@freebsd.org using -f
From: Sam Lawrance <lawrance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 99665 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: Tue, 20 Jun 2006 07:45:39 -0000

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

Change 99665 by lawrance@dirk on 2006/06/20 07:45:21

	Don't build functions which call other functions we don't have.
	These are unused and were optimised away with -O2 in CFLAGS, so
	the link errors didn't show up by default.
	
	Discussed with:	Peter Jeremy

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#14 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#14 (text) ====

@@ -841,6 +841,7 @@
 	*provmod = NULL;
 }
 
+#if defined(sun)
 static const char *
 dt_get_sysinfo(int cmd, char *buf, size_t len)
 {
@@ -855,6 +856,7 @@
 
 	return (buf);
 }
+#endif
 
 static dtrace_hdl_t *
 dt_vopen(int version, int flags, int *errp,

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#4 (text) ====

@@ -231,14 +231,13 @@
 	    progname, progname);
 }
 
+#if defined(sun)
 static void
 bigheap(void)
 {
 	size_t big, *size;
 	int sizes, i;
-#if defined(sun)
 	struct memcntl_mha mha;
-#endif
 
 	/*
 	 * First, get the available pagesizes.
@@ -267,7 +266,6 @@
 	if (brk((void *)((((uintptr_t)sbrk(0) - 1) & ~(big - 1)) + big)) != 0)
 		return;
 
-#if defined(sun)
 	/*
 	 * Finally, set our heap to use the largest page size for which the
 	 * MC_HAT_ADVISE doesn't return EAGAIN.
@@ -284,8 +282,8 @@
 		if (errno != EAGAIN)
 			break;
 	}
+}
 #endif
-}
 
 static void
 finalize_phase_one(workqueue_t *wq)