From owner-p4-projects@FreeBSD.ORG  Mon Jul  3 09:39:36 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 C562316A416; Mon,  3 Jul 2006 09:39:36 +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 8A88716A407
	for <perforce@freebsd.org>; Mon,  3 Jul 2006 09:39:36 +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 2E95A43D5A
	for <perforce@freebsd.org>; Mon,  3 Jul 2006 09:39:34 +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 k639dX1g065246
	for <perforce@freebsd.org>; Mon, 3 Jul 2006 09:39:33 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k639dXBD065243
	for perforce@freebsd.org; Mon, 3 Jul 2006 09:39:33 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 3 Jul 2006 09:39:33 GMT
Message-Id: <200607030939.k639dXBD065243@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 100475 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: Mon, 03 Jul 2006 09:39:37 -0000

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

Change 100475 by jb@jb_freebsd2 on 2006/07/03 09:38:33

	Make the Sparc Solaris definitions use FreeBSD's ELF headers where possible.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/sparc/sys/machelf.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/sparc/sys/machelf.h#2 (text) ====

@@ -33,12 +33,19 @@
 extern "C" {
 #endif
 
+#if defined(sun)
 #include <sys/elf_SPARC.h>
 #ifndef	_ASM
 #include <sys/types.h>
 #include <sys/elf.h>
 #include <sys/link.h>	/* for Elf*_Dyn */
 #endif	/* _ASM */
+#else
+#include <elf.h>
+#include <link.h>
+#include <opensolaris/compat/sys/elf.h>
+#include <opensolaris/compat/sys/link.h>
+#endif
 
 /*
  * Make machine class dependent data types transparent to the common code