From nobody Mon Apr 17 16:26:59 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 4Q0XWT1WLzz44sZH; Mon, 17 Apr 2023 16:27:01 +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 4Q0XWS22XSz41s9; Mon, 17 Apr 2023 16:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681748820; 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=832F9MFd+RXp+lQDP2+ISRE7xwL7ZAIEGPa+cU/YJQE=; b=DFk+Hg0QJb9z0/d+Gz7vel/a+vCxbQFLyYdWH+sRTbMv/THfu3rdApBlPQB0tSaFUZV8z7 djaIVi5wza6wx8nHwfblMBBRiOYr1+KBkRuLd9R6h0JvWKDFRdbJtx9Z4nxXwF/K/Kxx6t GmnhV8sz7qZk9H8RYCsNzUDyjcE+aK/pMY2ivMJj24JnOO+oAURPRR4wtpE4TKYvbXfk9t Orc3gcpj1HrSj12ukCMIX5azTYn2cCbQP6mHPsq6asVFQW1qL+LTs9YAnisJorpcrc3Lyi KYBZchlf8ROg+oaBK41Go/WuiTwCWWAJbsr8sAQFeekqx5XXXo43wgOPKo/pkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681748820; 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=832F9MFd+RXp+lQDP2+ISRE7xwL7ZAIEGPa+cU/YJQE=; b=tDyAttDKjjozX8dC8v7xJ8q3vQCR3I3kgSM1W6Loz8XfvbHObPm/LbouMyS9G6sIKSW3sh 6spFUgIgQH8+G/kUSszjcaT36pROmfIj8J7n7wYkXR30RUwIw2wYK59vz1ShoZjRPVP2cX vaRPBt8I0efDAyZ4Or1Phz6SwRbMJzT8FGKSVkMeS9P11T9mz3UA0MIzwSkLtylZsA9yK6 xug7vuwSz6YJf7bdiWZx9aDGaU3MR48UoIi7nG1W0mW0dB+f17WEGGNB7BrHxBW7bxdnOw urkT9wvmIvf5UCwJki5XDDNziQKoOH3ZZ1jO/nXWZq5SEHtdGI64x+0uHq27lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681748820; a=rsa-sha256; cv=none; b=I/774WmD6lcleQmxQKxDdOp3933SzKgklmdkXJkKXkBmfJEZegr1KH5NUq8HDM2vwQKPE9 rrO7vFqI6fpCqvj7ZnzvizVN0KSiQzdqyM2d3NcHOYW7M8q9bvWPtIqEwodPOj7PewRifl EZuH0Ew/Mj95wPIocCcxmsXLJDcY9DgqiPVADq71Uu/78qImae1Vu6yLO6sm9xbvcYV4b6 qTseNIz1oiahwJqnaNdn9w+392S/UloQcm+W0L3Wm0XmsxTjs9l8YjRIFrhdUIgSL8oEnV oor8gqmKR6kn7RW94vyfIRRMesL8VjQ/Fj/oD35G0cx5nzzdJoxsauV9itU3hw== 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 4Q0XWS10szzbp5; Mon, 17 Apr 2023 16:27:00 +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 33HGQxkP036631; Mon, 17 Apr 2023 16:26:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HGQxK5036630; Mon, 17 Apr 2023 16:26:59 GMT (envelope-from git) Date: Mon, 17 Apr 2023 16:26:59 GMT Message-Id: <202304171626.33HGQxK5036630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 458f4722bf97 - main - Suppress lld 16 errors about multiply defined symbols in rescue 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 458f4722bf974c7fa7961952fcaee146f5a97708 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=458f4722bf974c7fa7961952fcaee146f5a97708 commit 458f4722bf974c7fa7961952fcaee146f5a97708 Author: Dimitry Andric AuthorDate: 2023-04-17 16:25:30 +0000 Commit: Dimitry Andric CommitDate: 2023-04-17 16:26:27 +0000 Suppress lld 16 errors about multiply defined symbols in rescue lld >= 16 became more strict about multiply defined symbols. Since there are many of those in crunchgen'd programs, turn off the check when linking the rescue binary. MFC after: 1 week --- rescue/rescue/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 2360bf83b781..1f4db1d06b15 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -13,6 +13,12 @@ MK_PIE= no NO_SHARED= yes CRUNCH_BUILDOPTS+= MK_PIE=no NO_SHARED=yes +# lld >= 16 became more strict about multiply defined symbols. Since there are +# many of those in crunchgen'd programs, turn off the check. +.if ${LINKER_TYPE} == "lld" && ${LINKER_VERSION} >= 160000 +LDFLAGS+= -Wl,--allow-multiple-definition +.endif + PROG= rescue BINDIR?=/rescue