From nobody Thu Aug 11 03:31:35 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M3C5g5B3rz4YQy7; Thu, 11 Aug 2022 03:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M3C5g4lcFz3wQT; Thu, 11 Aug 2022 03:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660188695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=exTZI3xkL7IUPSlFRCps4jPDU5GhMHRBYReg6kD38Cw=; b=scESV9WqqGu0KHYgE0k4enZiCvpq8JuTAePPLrn5GCFY/vLJLrTcfaeWuWpM33zeZPnU8y fLU5zFWiLrK8OqxOmg3uRDJWAyMqKaeyGMYUA7QSzCyFWAKRRomPqbVeTw6hilSDxqJ4OF tUXiqkkEuCNr+PiRsb38Q2RJjxi1Cq8/KIqf2UgiR6VVMpFKV1viJCLKTVP+kmlQuhT8wq ZWUXQGyJGkm+9+J5TsgkJhDEYMnOldbfNdbDUyUEHQxVhvI/IWvix0xjL0xF/HYH/sKfWB wkdXjK+RtlSmUvCmrhYl8nNyq2Eu0p23R1k3WkyNjB7ZMfU6wGbRedMFftU9cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M3C5g3prkzcHp; Thu, 11 Aug 2022 03:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27B3VZrB007312; Thu, 11 Aug 2022 03:31:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27B3VZj9007311; Thu, 11 Aug 2022 03:31:35 GMT (envelope-from git) Date: Thu, 11 Aug 2022 03:31:35 GMT Message-Id: <202208110331.27B3VZj9007311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e2295b911723 - main - stand: i386/amd64: Always use elf format for /boot/loader and pxeldr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2295b9117233d8248fe919c6b28ef1d44a8950d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660188695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=exTZI3xkL7IUPSlFRCps4jPDU5GhMHRBYReg6kD38Cw=; b=BgQfbyWI8CZMMYoDdqJV4Mpo/NbXHLp0NDU51w2lMtp0ivBkpaG/YPkRm6l07OpwyXLnfY ZwKCPx0j8bN+W2zNun/4c7h1ifOcSix9CqZtU4hSBWZVSt9JcgT0mmBFION+zYQZQ98l+9 O90KBzi2jG4hci+FAPpziHZiwdcj7YmEIIm4FVSrCFsDf3CKKwaQZalxOTf6sL3atNJnO2 T5y56yZJ/CO9IPX4jRhmv4B9zyYYQ1IQF7i11gCgjlozKGt6my8Jm2woM7YAfEDqjebJv5 s1nxe4tQ9wuVddnsOkXai0fC4OtQpZ3phKxysoTOPZHRQAOqDTHVPxYRx5qPkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660188695; a=rsa-sha256; cv=none; b=t/2v4/q+5xU4L8KAKIdCf/i/4df/pj+L5ryH4tXcYkztmzoytTclVJuUNzUEg/jOypQdfV oWFU1PoMSnRj86RfronXg5vwTHHhLewLaPssGeuWb6L3o6auz2DsBPjCgt5BSULFlO+9fJ Os4ZJyz+fN6ZowNpxG0idezJ96i6MnAfJLpfxbQZTn+5O8/PGTZW7bKrOjtumOtlmI5AtG ABhZDRUmubbKkulDqbiNmS882qIiHfiAhUYxSZ11iFUTwDrQ+2R4T7VWojuWzh1Z1iwbOm gxE0DkbFNdHotg5VOwYIDW/tfl9Vns+06xPGz577/i1xYtoN5x+gfp0qMAdDPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e2295b9117233d8248fe919c6b28ef1d44a8950d commit e2295b9117233d8248fe919c6b28ef1d44a8950d Author: Warner Losh AuthorDate: 2022-08-11 03:18:32 +0000 Commit: Warner Losh CommitDate: 2022-08-11 03:28:22 +0000 stand: i386/amd64: Always use elf format for /boot/loader and pxeldr The first level boot blocks have understood how to load ELF code since 1999. Switch /boot/loader and /boot/pxeldr over to being ELF format so that in-tree tools can examine them more closely. In addition, one could, in theory, now have a 'lo-mem' and a 'hi-mem' segment (though a lot of work would need to be done with bounce buffers, btx, code segment marking, etc for an arrangement like that to work). As far as I can tell, this is the last a.out binary in the tree. There are several raw binaries left, but everything else is ELF. Reviewed by: emaste, kevans Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D36130 --- stand/i386/loader/Makefile | 2 +- stand/i386/pxeldr/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index 571e3b2cb653..3685281ffd2c 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -80,7 +80,7 @@ CFLAGS+= -I${BOOTSRC}/i386 vtfontcvt -f compressed-source -o ${.TARGET} ${.ALLSRC} ${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN} - btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ + btxld -v -f elf -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ -b ${BTXKERN} ${LOADER}.bin ${LOADER}.bin: ${LOADER}.sym diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile index 2184d391937f..a44dc0de2885 100644 --- a/stand/i386/pxeldr/Makefile +++ b/stand/i386/pxeldr/Makefile @@ -39,7 +39,7 @@ LDFLAGS+=${LDFLAGS_BIN} CLEANFILES+= ${LOADER} ${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXKERN} - btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ + btxld -v -f elf -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ -b ${BTXKERN} ${LOADERBIN} .include