From owner-p4-projects@FreeBSD.ORG  Fri Apr 14 00:31:47 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 349AC16A406; Fri, 14 Apr 2006 00:31:47 +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 1200C16A400
	for <perforce@freebsd.org>; Fri, 14 Apr 2006 00:31:47 +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 9020643D4C
	for <perforce@freebsd.org>; Fri, 14 Apr 2006 00:31:46 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E0Vk8b042503
	for <perforce@freebsd.org>; Fri, 14 Apr 2006 00:31:46 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E0VkRV042495
	for perforce@freebsd.org; Fri, 14 Apr 2006 00:31:46 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 14 Apr 2006 00:31:46 GMT
Message-Id: <200604140031.k3E0VkRV042495@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 95198 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 Apr 2006 00:31:47 -0000

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

Change 95198 by jb@jb_freebsd2 on 2006/04/14 00:31:19

	Stop using Sun's ELF and link headers and use ours instead. Include
	a couple of compatibility headers for Sun's extensions.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#3 edit

Differences ...

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

@@ -33,18 +33,26 @@
 extern "C" {
 #endif
 
+#if	defined(sun)
 #if defined(__amd64)
 #include <sys/elf_amd64.h>
 #elif defined(__i386)
 #include <sys/elf_386.h>
 #endif
+#endif
+
 #ifndef	_ASM
 #include <sys/types.h>
-#if	!defined(sun)
+#if	defined(sun)
+#include <sys/elf.h>
+#include <sys/link.h>	/* for Elf*_Dyn */
+#else
+#include <elf.h>
+#include <link.h>
 #include <opensolaris/compat/sys/types.h>
+#include <opensolaris/compat/sys/elf.h>
+#include <opensolaris/compat/sys/link.h>
 #endif
-#include <sys/elf.h>
-#include <sys/link.h>	/* for Elf*_Dyn */
 #endif	/* _ASM */
 
 /*