From nobody Tue Jan 24 22:11:48 2023 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 4P1h5c4NJ0z3bfqr; Tue, 24 Jan 2023 22:11:48 +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 4P1h5c3nMyz4PXx; Tue, 24 Jan 2023 22:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598308; 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=ZPKTW/nTHemGR5Rnf7Nu45wF6QeEbotGNSdYRauoojI=; b=Bu68m/A3vU3YZGZFKJg9O9i6Jf3UVrIpkbiIX+pmHsY3au/+ZUi1MuaNXlQy9C0+BvlRKQ zWjfGt1e4JpqRwrTAh3jHZGoewsy5XFdibD3iRFssFAd4dIGfhvHYUkknQ6fgCu+UyKmv4 4z2s1YLbcoqLAdypQXnfp6MlP/q1ajvfksBLzl0tk5BGtPnYGQN+VfCcFHFVW3M1V8pHHy UKsrqAaKdXiX3lsuLz6xeOgu9C7tWPMuIlIvRaNXrNl3Xpob3dFZuUHPUi1dOV1Il1F4Cu VxdAkoZ5ZmMvR7ztYeXRscuABO491/uGXFw4jypFEnoj7/ngu6IP1pn5Zg4s5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598308; 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=ZPKTW/nTHemGR5Rnf7Nu45wF6QeEbotGNSdYRauoojI=; b=dM+EGv4PhUAHxykw4rmBtucuzNzWou48p5NpD2RKQBN8Qqsi23aYEZ5oYcW+pNbg2i+Huw GGlxuv5YjDfVx641PCJgMXPmHnW8x0sFmY9JKMETbdqR5LCoIdvlwBLE/Qx8XNRIcBJRLp g0Pgcv36rOfAFGFZcQH61X5mPAfEtnREL19o4b9NBUBBgy3aIRipg0o3j7BRuu8JgOZBj3 mPGo83hilmIjDpMJqLAj38Mleg5NoZte+svTtBLn2Mq4Wv8GbBvbNiAuDK2+iu4Zhv6Nbn Oln27RYKC0Q4P5c4ltvVe55X34Hpupwz3lFoemkIJWCcP+PwX+UlLc2XnRRcMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598308; a=rsa-sha256; cv=none; b=y4pXldYxt3LTKSLFQKLA7u5EGZy9I+XmjlVftiH3xfaxVvTz7hHXr63OO11pT61IWfzq6I BscJOz+ThmelUnCvRRjHG6q7uTgk+H6J0wF1XLqXg6FbavEw9OFyIVFRTFK5iretfE5zr4 Ls9RuKgNyCn4b8gLmcckw7EWBpB2iI95bc1WApW3GEPHQcImIrFzZEJLbG4x/1hh0wjo0u Twm3ezH6dF6yUWZCgn3aZu3npjG8gL7OWbfUdjDjNLIqxQz4spOp95aty59N8P53ncsFPj mxhUmoUcmeOhkgIcg62LEo8dCk0oaF8kXHEnPdFkXpPzMO0Ven5Hv0pHkap93g== 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 4P1h5c2tXXzQP3; Tue, 24 Jan 2023 22:11:48 +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 30OMBmwo085222; Tue, 24 Jan 2023 22:11:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMBm0J085221; Tue, 24 Jan 2023 22:11:48 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:48 GMT Message-Id: <202301242211.30OMBm0J085221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5c505b9d8166 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5c505b9d8166d997015d3e841846b5222375a1e7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5c505b9d8166d997015d3e841846b5222375a1e7 commit 5c505b9d8166d997015d3e841846b5222375a1e7 Author: Warner Losh AuthorDate: 2022-08-11 03:18:32 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:29 +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 (cherry picked from commit e2295b9117233d8248fe919c6b28ef1d44a8950d) --- 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