From owner-p4-projects@FreeBSD.ORG  Mon Jul  3 09:39:38 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 D587F16A558; Mon,  3 Jul 2006 09:39:37 +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 C569B16A417
	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 A638543D5D
	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 k639dYGd065252
	for <perforce@freebsd.org>; Mon, 3 Jul 2006 09:39:34 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k639dYOi065249
	for perforce@freebsd.org; Mon, 3 Jul 2006 09:39:34 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 3 Jul 2006 09:39:34 GMT
Message-Id: <200607030939.k639dYOi065249@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 100476 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:38 -0000

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

Change 100476 by jb@jb_freebsd2 on 2006/07/03 09:38:59

	Adjust the 64-bit #ifdefs to apply to FreeBSD too.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newehdr.c#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newphdr.c#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/update.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newehdr.c#3 (text) ====

@@ -30,14 +30,14 @@
 
 #pragma ident	"@(#)newehdr.c	1.17	05/06/08 SMI"
 
+#if !defined(_ELF64)
 #if defined(sun)
-#if !defined(_ELF64)
 #pragma weak elf32_newehdr = _elf32_newehdr
-#endif
 #else
 #include <sys/cdefs.h>
 __weak_reference(_elf32_newehdr,elf32_newehdr);
 #endif
+#endif
 
 #include "syn.h"
 #include <stdlib.h>

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newphdr.c#3 (text) ====

@@ -30,14 +30,14 @@
 
 #pragma ident	"@(#)newphdr.c	1.17	05/06/08 SMI"
 
+#if !defined(_ELF64)
 #if defined(sun)
-#if !defined(_ELF64)
 #pragma weak elf32_newphdr = _elf32_newphdr
-#endif
 #else
 #include <sys/cdefs.h>
 __weak_reference(_elf32_newphdr,elf32_newphdr);
 #endif
+#endif
 
 #include "syn.h"
 #include <stdlib.h>

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/update.c#4 (text) ====

@@ -30,14 +30,14 @@
 
 #pragma ident	"@(#)update.c	1.26	06/03/24 SMI"
 
+#if !defined(_ELF64)
 #if defined(sun)
-#if !defined(_ELF64)
 #pragma weak elf_update = _elf_update
-#endif
 #else
 #include <sys/cdefs.h>
 __weak_reference(_elf_update,elf_update);
 #endif
+#endif
 
 #include "syn.h"
 #include <memory.h>