From nobody Tue Apr 16 20:13:23 2024 X-Original-To: dev-commits-src-branches@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 4VJwGC2wngz5H0Td; Tue, 16 Apr 2024 20:13:23 +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 4VJwGC1wXqz4v62; Tue, 16 Apr 2024 20:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298403; 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=8RQ+ITWoiXVSfpGly4oFsOJww6JD2Y19vSZhDXQQNpI=; b=hoLN0LYZdoOG828Gvobnpaou4UfSNm/XtuTXFPjvBMA2TqYQ2kaY6tu8OIYZoGE2bobjQX nFiD8ZSjeJKVhLWUxSJNuf28c4700rFuWmi4LN7mzny6U9AjMMifKLEh9rDVy9hnGYxE1R UxOaLRvs4BX+tyDiuY4gSLubaGS9Z+RZZoZQ+Ttbo5BeptXmKPaKTNVedOPJXUWs3JcFc/ fhsUqzmVwjgEt1MFUnlCofmkMWj6dreIHbBP6jkrzz5Hg+VH992YlMmMrK48iLDb9GV5IP 8OUEA8/s+cnjvDZ62ZBxtBPn0g5CzrLDhQttg5mFSqsAqf3A7C8GM6vRGs4K9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298403; a=rsa-sha256; cv=none; b=MdzB87coUREcpOY1UyIynClGUFQdYINGv12eGVPaTdm+RHVqEygJk0EWQ6QZvkEqGihu5A wrB0Z1MEwUTVYMt2iOv32YZSs+theskTyW4sNkRaEpTcDnl15bPcaoWs1/saA1DafBWqlc n99M2iiLVKKbcS8W3c1p6qZ+oH2YpBUUnGcdbqxZRmnnnghuktTf5Rho0e2QAnrWs3/owj Ee/90hSCcfXErViaBen3mSiqMCO9Ry5RfiGRNTSRjbZJzxSwq5o8e6JuS+dRUaD7KGh6pp NMXu66Ip8zuyNQzV3PfSExch11FWv8brAxcA0A0gLdoF2JXpRQt39m7UDQApXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298403; 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=8RQ+ITWoiXVSfpGly4oFsOJww6JD2Y19vSZhDXQQNpI=; b=qaEQYhgjAGUguXXO9L2ybI8Ticd9NdCqHZroXfjb/r8xOTbPzGf61Dj0aApfjc3gCRCv7k OZ2Z4e1GkeNpgnHjn14JOXM4DPYPZ7h6Sp8Pd5ukGkAL4gI3RTrDy8KIgo5bDEp7fGnVpX 7Rf1LqG1jyAMk6qz25NGbLkCF9DrEbDrHlZIqRrfCdno5QaJO3AVnIFWoJYlBlrAddF2UZ jw/00ye3ax18MDdOKIurbZFQX+xnluLdawJ1v6p2sQ4+BBcci5uXFpQQ8r+E+5x/HoaaXj ro5ilVCizGu88FjdLgAgpl2DbTw2JLldnn8HiH1H+YjqL+wMR0Ux9twoawoshA== 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 4VJwGC1PDPzxWW; Tue, 16 Apr 2024 20:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GKDNiK039443; Tue, 16 Apr 2024 20:13:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKDN56039440; Tue, 16 Apr 2024 20:13:23 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:13:23 GMT Message-Id: <202404162013.43GKDN56039440@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: 7cc0ac566600 - stable/14 - loader/efi: Only include interpreter's linker script List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 7cc0ac56660095543aa2a71c787f4277f64d9c00 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7cc0ac56660095543aa2a71c787f4277f64d9c00 commit 7cc0ac56660095543aa2a71c787f4277f64d9c00 Author: Warner Losh AuthorDate: 2024-02-25 00:57:29 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:28 +0000 loader/efi: Only include interpreter's linker script For safety, only include the interpreter's linker script. Note that the simple loader doesn't have one, but it's not an error to copy a ELF section that does not exist. No functional change, however. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44064 (cherry picked from commit f5f08e41aa57f94e3c127a488a82b4e518781f89) --- stand/efi/loader/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index b8a98fc1dd47..b3395bdfdf53 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -117,7 +117,7 @@ ${LOADER}.efi: ${PROG} ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \ - -j set_X4th_compile_set -j set_Xlua_compile_set \ + -j set_X${LOADER_INTERP}_compile_set \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a