From owner-p4-projects@FreeBSD.ORG  Wed Apr 30 19:56:47 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C0BCC37B404; Wed, 30 Apr 2003 19:56:46 -0700 (PDT)
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 6061D37B401
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 19:56:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0DDDD43F93
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 19:56:46 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h412uj0U097974
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 19:56:45 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h412ujHc097971
	for perforce@freebsd.org; Wed, 30 Apr 2003 19:56:45 -0700 (PDT)
Date: Wed, 30 Apr 2003 19:56:45 -0700 (PDT)
Message-Id: <200305010256.h412ujHc097971@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30244 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 01 May 2003 02:56:47 -0000

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

Change 30244 by peter@peter_daintree on 2003/04/30 19:56:15

	Only add the elf64 contamination if it is explicitly wanted

Affected files ...

.. //depot/projects/hammer/sys/i386/include/elf.h#3 edit

Differences ...

==== //depot/projects/hammer/sys/i386/include/elf.h#3 (text+ko) ====

@@ -34,7 +34,9 @@
  */
 
 #include <sys/elf32.h>	/* Definitions common to all 32 bit architectures. */
+#if defined(__ELF_WORD_SIZE) && __ELF_WORD_SIZE == 64
 #include <sys/elf64.h>	/* Definitions common to all 64 bit architectures. */
+#endif
 
 #ifndef __ELF_WORD_SIZE
 #define	__ELF_WORD_SIZE	32	/* Used by <sys/elf_generic.h> */
@@ -62,10 +64,12 @@
 	} a_un;
 } Elf32_Auxinfo;
 
+#if __ELF_WORD_SIZE == 64
 /* Fake for x86-64 loader support */
 typedef struct {
 	int fake;
 } Elf64_Auxinfo;
+#endif
 
 __ElfType(Auxinfo);