From owner-dev-commits-src-all@freebsd.org Wed Sep 15 10:31:31 2021
Return-Path: <owner-dev-commits-src-all@freebsd.org>
Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 813BE67C62E;
Wed, 15 Sep 2021 10:31:31 +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 4H8c2W3226z3wNY;
Wed, 15 Sep 2021 10:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 490E942FB;
Wed, 15 Sep 2021 10:31:31 +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 18FAVVr8041708;
Wed, 15 Sep 2021 10:31:31 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18FAVVmo041707;
Wed, 15 Sep 2021 10:31:31 GMT (envelope-from git)
Date: Wed, 15 Sep 2021 10:31:31 GMT
Message-Id: <202109151031.18FAVVmo041707@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Dimitry Andric <dim@FreeBSD.org>
Subject: git: 6d8f2277dee6 - stable/13 - i386 loaders: avoid lld 13 garbage
collecting linker sets
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: dim
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 6d8f2277dee6ea50b6567fc6ce6816ba02362ae9
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the src repository
<dev-commits-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Sep 2021 10:31:31 -0000
The branch stable/13 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=6d8f2277dee6ea50b6567fc6ce6816ba02362ae9
commit 6d8f2277dee6ea50b6567fc6ce6816ba02362ae9
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2021-09-08 12:04:13 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2021-09-15 10:28:44 +0000
i386 loaders: avoid lld 13 garbage collecting linker sets
Because lld 13 and higher default to garbage collecting start/stop
symbols when using --gc-sections, the linker sets used in the i386 boot
loaders will disappear. This leads to the loaders not recognizing any
commands, and failure to boot.
Until we have a good set of linker scripts for the loaders, work around
it by disabling the start-stop-gc feature.
(cherry picked from commit c90cab0d668af5d947054e47184d4f8dcb874ec8)
---
stand/i386/loader/Makefile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile
index 0abf6120c1e3..571e3b2cb653 100644
--- a/stand/i386/loader/Makefile
+++ b/stand/i386/loader/Makefile
@@ -61,6 +61,12 @@ ORG= 0x0
CFLAGS+= -Wall
LDFLAGS+= -static ${LDFLAGS_ORG} -Wl,--gc-sections
+.if ${LINKER_TYPE} == "lld" && ${LINKER_VERSION} >= 130000
+# lld 13 and higher default to garbage collecting start/stop symbols,
+# completely ruining our linker sets. For now, work around it by
+# disabling this un-feature.
+LDFLAGS+= -Wl,-z,nostart-stop-gc
+.endif
# i386 standalone support library
LIBI386= ${BOOTOBJ}/i386/libi386/libi386.a