From owner-p4-projects@FreeBSD.ORG  Fri Apr 14 21:36:43 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 21DC116A403; Fri, 14 Apr 2006 21:36:43 +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 D9F2C16A401
	for <perforce@freebsd.org>; Fri, 14 Apr 2006 21:36:42 +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 A4F9043D46
	for <perforce@freebsd.org>; Fri, 14 Apr 2006 21:36:42 +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 k3ELag2g040589
	for <perforce@freebsd.org>; Fri, 14 Apr 2006 21:36:42 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELag4R040583
	for perforce@freebsd.org; Fri, 14 Apr 2006 21:36:42 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 14 Apr 2006 21:36:42 GMT
Message-Id: <200604142136.k3ELag4R040583@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 95280 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 21:36:43 -0000

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

Change 95280 by jb@jb_freebsd2 on 2006/04/14 21:36:40

	Define _ELF32 or _ELF64 (which the Solaris code tests for) in terms of
	our __ELF_WORD_SIZE. I'm trying to use as many of our headers as possible.

Affected files ...

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

Differences ...

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

@@ -52,6 +52,11 @@
 #include <opensolaris/compat/sys/types.h>
 #include <opensolaris/compat/sys/elf.h>
 #include <opensolaris/compat/sys/link.h>
+#if __ELF_WORD_SIZE == 32
+#define _ELF32
+#else
+#define _ELF64
+#endif
 #endif
 #endif	/* _ASM */