From nobody Sat Apr 29 07:37:32 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 4Q7hC06rRmz48ccS; Sat, 29 Apr 2023 07:37:32 +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 4Q7hC05srTz3J9j; Sat, 29 Apr 2023 07:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753852; 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=uIxszOQOgeupqzBoyMg+zo//LrZ1suc3ntYCrD5/0Ss=; b=eQBiml2AjDJ8j0DFN7HSjrmDfrHKlEfp30+JMcSTuXsWbzM4NYQyE4oO3WGXU3OoqndZqM u131X3U++I8QwPOzU0tUHqppoZoookn2uHfWOp2Z9hcF+PI6u4c1AEOMlbHRAFMEPOMT/p AvCGG7mHMgI8pG7B3TGl1F3p5c4hJyl9dYZEpRI1GeS8XnTtOC9YESXcPmFhahPjHXGkT5 LLftHAxr96VEe0m/4C0smlpWGuUMFHV6WRm0Z8l73GNFPjW3MFfaHN4Yjg5GALioh5ov1u kWSKX7aIwoo9zxVUn4AE3gfRHew2DFHSpEt2UEFmSS2zZwimsTpxDTWl1nqKqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753852; 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=uIxszOQOgeupqzBoyMg+zo//LrZ1suc3ntYCrD5/0Ss=; b=w7903WrZR/8XkJz27uadpBGfZV0cl1oK02hyUJGsKpIBEw3YXjGzPSXrOC7jVQVp3ILdyF UGMNKy0AGVl9Yqttds85EPNrK7ZizPDIuGjSE+fbxs+ne95UUnUH9X9jls7WjqL+fhUOcM NO8a/OddaHGU2720ZFFakkaDs4spS/Aed7ySvVkVELMnWkjNWZUBg7P4AO7Qle30fqvFSt R4rnwoT1BvpBLb6JNljqpO0Kd+oydcQk8zRWD8WhgOuVBEaNXUN0of/UsVUi/DKG53Vqmf Feh7TsnqTd8tMqYMxxXeH8J8zZhpozPbgHPI+EADF78cXdI01Kzo6AejKzJG1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753852; a=rsa-sha256; cv=none; b=knvfAtFBBNgo1UM+eDL5qr8nI7D84BJ4S5Z/JuyoWczN1EykGCw9GibSv0dKaaCRTCsnXy cAfilCuybwgYTppnf/n++el/yHxxJQNtiSO+jZdzlOColudJj2Ph1ZAZYuVEMcHfIdXZ1E 58uSPTPLfbuKJUyMKqCXCG2WWf7sNHVfoSQq15VccQ4boTOAmHRoW/U7mec+1hQACPAmJh nbEY8CdRyHdgYvYqQkHSDLJAA7cFpMD21hVOPVfnRx6mDnzbZamUUg9IjAMCm435kCGpCv SUDb1259aMed13QoKEpCDxAKwBVbQJ6CKznDOkgdzkdKcTO4m2bkuJ2jpXrjWw== 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 4Q7hC04jkfzYR3; Sat, 29 Apr 2023 07:37:32 +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 33T7bWFb064481; Sat, 29 Apr 2023 07:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7bWUl064480; Sat, 29 Apr 2023 07:37:32 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:37:32 GMT Message-Id: <202304290737.33T7bWUl064480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: c14351db0d06 - stable/12 - Suppress lld 16 errors about multiply defined symbols in rescue 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c14351db0d06b67a2cc2b5318f25df07602bbe71 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c14351db0d06b67a2cc2b5318f25df07602bbe71 commit c14351db0d06b67a2cc2b5318f25df07602bbe71 Author: Dimitry Andric AuthorDate: 2023-04-17 16:25:30 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:24:24 +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 (cherry picked from commit 458f4722bf974c7fa7961952fcaee146f5a97708) --- rescue/rescue/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 8faf4d29877b..4395aca895d1 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -8,6 +8,12 @@ MAN= MK_SSP= 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