PERFORCE change 30244 for review

[Peter Wemm]

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

Change 30244 by peter at 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);