From owner-p4-projects@FreeBSD.ORG  Tue Jun 28 19:25:42 2005
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 2D79916A424; Tue, 28 Jun 2005 19:25:42 +0000 (GMT)
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 0962C16A41F
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 19:25:42 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E9EC943D1D
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 19:25:41 +0000 (GMT)
	(envelope-from peter@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 j5SJPfYY097386
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 19:25:41 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5SJPfMO097383
	for perforce@freebsd.org; Tue, 28 Jun 2005 19:25:41 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 28 Jun 2005 19:25:41 GMT
Message-Id: <200506281925.j5SJPfMO097383@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>
Cc: 
Subject: PERFORCE change 79095 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: Tue, 28 Jun 2005 19:25:43 -0000

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

Change 79095 by peter@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();