From owner-svn-src-all@FreeBSD.ORG Thu Mar 27 20:21:13 2014 Return-Path: <owner-svn-src-all@FreeBSD.ORG> Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BD3AC127; Thu, 27 Mar 2014 20:21:13 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8FC4F5A; Thu, 27 Mar 2014 20:21:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2RKLDm9061203; Thu, 27 Mar 2014 20:21:13 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2RKLDpr061202; Thu, 27 Mar 2014 20:21:13 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201403272021.s2RKLDpr061202@svn.freebsd.org> From: Christian Brueffer <brueffer@FreeBSD.org> Date: Thu, 27 Mar 2014 20:21:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r263837 - stable/8/usr.sbin/btxld X-SVN-Group: stable-8 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.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" <svn-src-all.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/> List-Post: <mailto:svn-src-all@freebsd.org> List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 27 Mar 2014 20:21:13 -0000 Author: brueffer Date: Thu Mar 27 20:21:13 2014 New Revision: 263837 URL: http://svnweb.freebsd.org/changeset/base/263837 Log: MFC: r262484 In puthdr(), start the ELF .data section on a new page, as this is what btxldr expects (.set MEM_DATA,start+0x1000 in btxldr.S). This makes resulting ELF binaries bootable with grub, gptboot and boot2. PR: 153801 Submitted by: Gleb Kurtsou <gleb.kurtsou at gmail.com> Tested by: Ruben Kerkhof <ruben at rubenkerkhof.com> Glanced at by: jhb, peter Modified: stable/8/usr.sbin/btxld/btxld.c Directory Properties: stable/8/usr.sbin/btxld/ (props changed) Modified: stable/8/usr.sbin/btxld/btxld.c ============================================================================== --- stable/8/usr.sbin/btxld/btxld.c Thu Mar 27 20:20:20 2014 (r263836) +++ stable/8/usr.sbin/btxld/btxld.c Thu Mar 27 20:21:13 2014 (r263837) @@ -426,7 +426,7 @@ puthdr(int fd, struct hdr *hdr) le32toh(eh.p[0].p_filesz)); eh.p[1].p_vaddr = eh.p[1].p_paddr = htole32(align(le32toh(eh.p[0].p_paddr) + le32toh(eh.p[0].p_memsz), - 4)); + 4096)); eh.p[1].p_filesz = eh.p[1].p_memsz = htole32(hdr->data); eh.sh[2].sh_addr = eh.p[0].p_vaddr; eh.sh[2].sh_offset = eh.p[0].p_offset;