PERFORCE change 79095 for review

[Peter Wemm]

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

Change 79095 by peter at peter_daintree on 2005/06/28 19:25:01

	sync with i386

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#20 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#20 (text+ko) ====

@@ -221,7 +221,7 @@
 cb_dumphdr(struct md_pa *mdp, int seqnr, void *arg)
 {
 	struct dumperinfo *di = (struct dumperinfo*)arg;
-	Elf64_Phdr phdr;
+	Elf_Phdr phdr;
 	uint64_t size;
 	int error;
 
@@ -270,7 +270,7 @@
 void
 dumpsys(struct dumperinfo *di)
 {
-	Elf64_Ehdr ehdr;
+	Elf_Ehdr ehdr;
 	uint64_t dumpsize;
 	off_t hdrgap;
 	size_t hdrsz;
@@ -281,7 +281,7 @@
 	ehdr.e_ident[EI_MAG1] = ELFMAG1;
 	ehdr.e_ident[EI_MAG2] = ELFMAG2;
 	ehdr.e_ident[EI_MAG3] = ELFMAG3;
-	ehdr.e_ident[EI_CLASS] = ELFCLASS64;
+	ehdr.e_ident[EI_CLASS] = ELF_CLASS;
 #if BYTE_ORDER == LITTLE_ENDIAN
 	ehdr.e_ident[EI_DATA] = ELFDATA2LSB;
 #else
@@ -294,8 +294,8 @@
 	ehdr.e_phoff = sizeof(ehdr);
 	ehdr.e_flags = 0;
 	ehdr.e_ehsize = sizeof(ehdr);
-	ehdr.e_phentsize = sizeof(Elf64_Phdr);
-	ehdr.e_shentsize = sizeof(Elf64_Shdr);
+	ehdr.e_phentsize = sizeof(Elf_Phdr);
+	ehdr.e_shentsize = sizeof(Elf_Shdr);
 
 	md_pa_init();