From owner-svn-src-all@FreeBSD.ORG Sun Nov 10 22:42:57 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2738F723; Sun, 10 Nov 2013 22:42:57 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1350A26FE; Sun, 10 Nov 2013 22:42:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAAMgu66072520; Sun, 10 Nov 2013 22:42:56 GMT (envelope-from andreast@svn.freebsd.org) Received: (from andreast@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAAMguhS072519; Sun, 10 Nov 2013 22:42:56 GMT (envelope-from andreast@svn.freebsd.org) Message-Id: <201311102242.rAAMguhS072519@svn.freebsd.org> From: Andreas Tobler Date: Sun, 10 Nov 2013 22:42:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257928 - head/sys/powerpc/powerpc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Nov 2013 22:42:57 -0000 Author: andreast Date: Sun Nov 10 22:42:56 2013 New Revision: 257928 URL: http://svnweb.freebsd.org/changeset/base/257928 Log: Prepare for 64-bit. Iow, use Elf_*hdr instead of the 32-bit ones. Modified: head/sys/powerpc/powerpc/dump_machdep.c Modified: head/sys/powerpc/powerpc/dump_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/dump_machdep.c Sun Nov 10 22:19:34 2013 (r257927) +++ head/sys/powerpc/powerpc/dump_machdep.c Sun Nov 10 22:42:56 2013 (r257928) @@ -161,7 +161,7 @@ static int cb_dumphdr(struct pmap_md *md, int seqnr, void *arg) { struct dumperinfo *di = (struct dumperinfo*)arg; - Elf32_Phdr phdr; + Elf_Phdr phdr; int error; bzero(&phdr, sizeof(phdr)); @@ -208,7 +208,7 @@ foreach_chunk(callback_t cb, void *arg) void dumpsys(struct dumperinfo *di) { - Elf32_Ehdr ehdr; + Elf_Ehdr ehdr; uint32_t dumpsize; off_t hdrgap; size_t hdrsz; @@ -219,7 +219,7 @@ dumpsys(struct dumperinfo *di) ehdr.e_ident[EI_MAG1] = ELFMAG1; ehdr.e_ident[EI_MAG2] = ELFMAG2; ehdr.e_ident[EI_MAG3] = ELFMAG3; - ehdr.e_ident[EI_CLASS] = ELFCLASS32; + ehdr.e_ident[EI_CLASS] = ELF_TARG_CLASS; #if BYTE_ORDER == LITTLE_ENDIAN ehdr.e_ident[EI_DATA] = ELFDATA2LSB; #else @@ -228,11 +228,11 @@ dumpsys(struct dumperinfo *di) ehdr.e_ident[EI_VERSION] = EV_CURRENT; ehdr.e_ident[EI_OSABI] = ELFOSABI_STANDALONE; /* XXX big picture? */ ehdr.e_type = ET_CORE; - ehdr.e_machine = EM_PPC; + ehdr.e_machine = ELF_ARCH; /* Defined in powerpc/include/elf.h */ ehdr.e_phoff = sizeof(ehdr); ehdr.e_ehsize = sizeof(ehdr); - ehdr.e_phentsize = sizeof(Elf32_Phdr); - ehdr.e_shentsize = sizeof(Elf32_Shdr); + ehdr.e_phentsize = sizeof(Elf_Phdr); + ehdr.e_shentsize = sizeof(Elf_Shdr); /* Calculate dump size. */ dumpsize = 0L;