Date: Thu, 10 Sep 2009 00:47:32 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r197051 - head/usr.sbin/btxld Message-ID: <200909100047.n8A0lWwR002368@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Thu Sep 10 00:47:32 2009 New Revision: 197051 URL: http://svn.freebsd.org/changeset/base/197051 Log: The boot loader is a FreeBSD a.out binary for x86, not a VAX binary. Rather than writing out a MID of '0', write a MID of 0x86 (aka MID_I386) so that file gets it right. This is a nop for boot2. It just checks the MAGIC part of the field, ignoring the MID. boot2 is the only thing that loads this file, and only on x86 so the MID_i386 is always the right value (the rest of the code is already x86 specific). Reviewed by: bde@, jhb@ MFC after: 8.0 is out the door :) Modified: head/usr.sbin/btxld/btxld.c Modified: head/usr.sbin/btxld/btxld.c ============================================================================== --- head/usr.sbin/btxld/btxld.c Wed Sep 9 21:51:54 2009 (r197050) +++ head/usr.sbin/btxld/btxld.c Thu Sep 10 00:47:32 2009 (r197051) @@ -407,7 +407,7 @@ puthdr(int fd, struct hdr *hdr) switch (hdr->fmt) { case F_AOUT: memset(&ex, 0, sizeof(ex)); - N_SETMAGIC(ex, ZMAGIC, MID_ZERO, 0); + N_SETMAGIC(ex, ZMAGIC, MID_I386, 0); hdr->text = N_ALIGN(ex, hdr->text); ex.a_text = htole32(hdr->text); hdr->data = N_ALIGN(ex, hdr->data);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909100047.n8A0lWwR002368>