From nobody Wed May 11 00:30:04 2022 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 F3D721AE487F; Wed, 11 May 2022 00:30:05 +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 4KybQj4W2Gz4nk9; Wed, 11 May 2022 00:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652229005; 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=Sk4mevAEfWC4G5iVfA30pHiHtGlN4gu5sxuMsuBKvk8=; b=cHi3iG78r7M6VKVLA5mSS5mESzNJCXf79r5+gpDtRehBH/IeW+tqQqJ0aKFFvlSvY3uUuS 8WB36BG3hUfcxLyrw2fCI15Pgx6NFhO+2dnLU+UNELNfKE2EoJbLYP957JoxCfKXRX9/gI pvHrI0aw/o2sfdzLDWIS6btL5f9L1oTZbzhEbRn3fYKCIorAq9OisWvLXOhyum7W7VRLMJ 9sYUr3hw5RSQkI/AuVvOUb6hK/lpBQGp4fgHPjajiiXXwxbUhaa2NWgjrA/4cNVeBkjEns L3ciO8IBSPFPleeljxT/6o5PhZlg1mTdhnZLgX60jFc9np8N72wRdkOE2/HEvA== 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 26322775C; Wed, 11 May 2022 00:30:05 +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 24B0U4Oj056676; Wed, 11 May 2022 00:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24B0U47U056673; Wed, 11 May 2022 00:30:04 GMT (envelope-from git) Date: Wed, 11 May 2022 00:30:04 GMT Message-Id: <202205110030.24B0U47U056673@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: 8d3f27908b69 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 8d3f27908b69d47f4e669d8fe424c79f6da33880 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652229005; 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=Sk4mevAEfWC4G5iVfA30pHiHtGlN4gu5sxuMsuBKvk8=; b=EvvLErP+PN1BcFgTQz64BOb4HuSx5wTz+GPCvRbCDumD4HICSb/f7u3OVX+aVvFiLHouo6 xSrhy4VvB+9cbjV6OWvrcPlHstSlr7XGt5tzRK9ls/vYmHqPFY9xxCcZd61vkIilCR0ZWT 4u3wo27J5s0OszTYfGtVssBOHKu5quz7V9mePwitoFDekC45WagRpRfNxm92tqwRKYjR4a 3yF/cC1rVNChi9u9Y5bWmZyo3S4Ar5MpxFUfZtzXcMAnDBqAUocGeZODHS90W5L7ON60Xp kow22vtVssh4Lu/pFc0xbThslx9Y/LpF9ZwWhz9HMyk86ci76urVaDe+M7cKvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652229005; a=rsa-sha256; cv=none; b=il/Lab/g/hW0vriASrGGHLpxIs9I7K9ELte0y70t5I244QuB5mLSYuCJlOPtYIK4n+ERbY /7O9KDrxxsZWB+L4uA/uIGmSosAs5lkqtkjN44z7sHUw5wLgPJyhkb8WGUStzY/cQuVPqk uWrRK8JdVF90Kzl0/h2JzIv4zhhcbuoC8OJ6lz4/eIaO2y3PjXd0VWj1ZDxkTYBtBwWwCh ZQE0zUc7yqhEYkBI0DMbt7uzlrNRZtfavfd2rlJlrH3CZ2dnAL5CYCe+FLtcuHlkS0Nv1O vunrKHpRJvfzyCcJ51yOsVHhOnU6/Hatm/stos1NKDN+oGS7ahBvMnWvUQ3rtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8d3f27908b69d47f4e669d8fe424c79f6da33880 commit 8d3f27908b69d47f4e669d8fe424c79f6da33880 Author: John Baldwin AuthorDate: 2022-02-02 20:18:43 +0000 Commit: John Baldwin CommitDate: 2022-05-11 00:06:26 +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 39dc4f8e70ad..6ed777727552 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -65,6 +65,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 dd25c940e0e9..1edb5674712e 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -99,6 +99,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