Author: brueffer
Date: Thu Mar 27 20:19:11 2014
New Revision: 263835
URL: http://svnweb.freebsd.org/changeset/base/263835
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/10/usr.sbin/btxld/btxld.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/btxld/btxld.c
==============================================================================
--- stable/10/usr.sbin/btxld/btxld.c Thu Mar 27 20:15:35 2014
(r263834)
+++ stable/10/usr.sbin/btxld/btxld.c Thu Mar 27 20:19:11 2014
(r263835)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
