From nobody Wed Mar 22 22:28:34 2023 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 4Phjmf2jfCz41P6V; Wed, 22 Mar 2023 22:28:34 +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 4Phjmf1zbVz3hrl; Wed, 22 Mar 2023 22:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524114; 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=BPNcOUi7CiQxByB7fmWGUE1tlg+z98Agnqrplc/vijg=; b=VBV1U4GAjble0HVKm8O6BZis1ShNxfSXgDFGGT7EyazkKPhlr6+JSKcCzzBNarhqRoRqRE 6ZJQwa+HHHM2/N3KJHaCdeNydTubMPvODxGQeDxsCGKOjRSx5Tm2ma+Nkyso4+FkIvPVHj 6+WmwBwfhtjzyuhI2L3Ixj8RfpC3QLf6fjylTdqlqVyEwayFK0rkSCGyuMaYwR+SGyeOrW 8qSCvoeeXLpMng3wBfE5FnGiO6PodajKyGn6qYtgM5525nD499fq+tdHGw7jHDrWsrbq0Q CQ0xx83RbyFGKL5bKsl604Mo4ajX8R6RlCErZE51nPlc+nLAaxfZqdK6EidZCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524114; 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=BPNcOUi7CiQxByB7fmWGUE1tlg+z98Agnqrplc/vijg=; b=SP3PVHiiwJ+mdTmMVr4xLTjw7qMPXL8e0xIv6AaLDoGqvQ9wE+HsOhP6YTkAQE990pumXJ PC3aTuc5gPULNGrwl8eSGYrXBhFjbHUlaxqrOj4pJGO8E6QYqs4HZuSepA2AvcEGEkK4kB fGL3mLsYkj1VG3DmF9BWuFPWLAJEU6qgzxQLpoOPOj+fB2pG8rVnNj8VrzQ9xFdTL5pIBT npCTR5D2ziLjzw/sfX6A7jcc3CGBlYHlBZQ3k7QIJwLDGCTzIWiMiPMjjYn1LeUEaTtM+T pgnYBjWZuST5Le9V85U++2bUaIAK31UNpWhWGR/GG18j7KAzfKFkvsL+n9k7tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524114; a=rsa-sha256; cv=none; b=mbhZ2Sccem15qxLyNMjRLI9jAx3ZW4c3iNJgBGfU9/ww7Z4Z2A0WYUPkDlKlQDaJHtPJB9 88x/AtzzVZiIhCCFr/vHCIdU4p0c/j677L6IenA3c0KNam8cNFRkOJqvxO1bFOBaCun3wZ lGRBdLUciGJzcsXJL2IwS51LFcnn4WQEPjEZ0nTtA/icC29iSNMsB2rpgYl2cO8CHminr2 fWNGyv4cBFuOSmGV0pKyrGALmiNW65c9fV0RBYFXAuQsmkSDYJXVdPcjiVyISwCQqAr8KI 21h03iEXg0B/b2Rg9PLILUEub7nDIUdTBnWRvWrgKA4vwGexhv96NToi73lbdA== 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 4Phjmf15cRz1BM6; Wed, 22 Mar 2023 22:28:34 +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 32MMSYVR001739; Wed, 22 Mar 2023 22:28:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSYxV001738; Wed, 22 Mar 2023 22:28:34 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:34 GMT Message-Id: <202303222228.32MMSYxV001738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8e7ba6eb44da - stable/12 - stand/efi: Pass --no-dynamic-linker to ld.bfd >= 2.34. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8e7ba6eb44da1c4dc538954c7e1a686aafc72b8b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8e7ba6eb44da1c4dc538954c7e1a686aafc72b8b commit 8e7ba6eb44da1c4dc538954c7e1a686aafc72b8b Author: John Baldwin AuthorDate: 2022-02-02 20:18:43 +0000 Commit: John Baldwin CommitDate: 2023-03-22 18:23:00 +0000 stand/efi: Pass --no-dynamic-linker to ld.bfd >= 2.34. ld.bfd in binutils 2.34+ now reports an error in more cases for custom ldscripts that do not place PHDRs in a LOAD segment. However, EFI binaries are not dynamic binaries which need PHDRs, so pass --no-dynamic-linker to disable this check. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D34124 (cherry picked from commit 8bd5e2f15cc9756e7d6b7feb43ec47f18a38e2bf) --- stand/efi/boot1/Makefile | 3 +++ stand/efi/loader/Makefile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index bf3860f36b5d..a11ad17eeb30 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -66,6 +66,9 @@ FILESMODE_${BOOT1}.efi= ${BINMODE} LDSCRIPT= ${EFISRC}/loader/arch/${MACHINE}/ldscript.${MACHINE} LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie +.if ${LINKER_TYPE} == "bfd" && ${LINKER_VERSION} >= 23400 +LDFLAGS+= -Wl,--no-dynamic-linker +.endif .if ${MACHINE_CPUARCH} == "aarch64" CFLAGS+= -mgeneral-regs-only diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 993a869ab13e..9f782f158c54 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -85,6 +85,9 @@ LINKS+= ${BINDIR}/${LOADER}.efi ${BINDIR}/loader.efi LDSCRIPT= ${.CURDIR}/../loader/arch/${MACHINE}/ldscript.${MACHINE} LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie +.if ${LINKER_TYPE} == "bfd" && ${LINKER_VERSION} >= 23400 +LDFLAGS+= -Wl,--no-dynamic-linker +.endif CLEANFILES+= loader.efi