From nobody Sat Apr 29 07:36:44 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 4Q7hB43vZZz48cx1; Sat, 29 Apr 2023 07:36:44 +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 4Q7hB43R4fz3GMM; Sat, 29 Apr 2023 07:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753804; 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=by4fho9CoOHb33sYWbejBhNiDwTeUB5n+PchPM7+IZQ=; b=D/aPyD9ZMRgfgAuyR7/4fHu1aos5lzzM2zMOdV8RbXr3LlNboOmDrpFxwVM+LtXCf0kMJ2 bexKwUrPS4ZziNsW9LzP256SU97jWoRDeoKRrpkViFqsshSQjiIvziWmzvt/OfvnknvNea t3oKXT3ZhPv3UZNL6r99DcLhv8Nc+Z5Ply3YYkSzq9JapG3rt+PogjJ8rzkExBHTrJk5nn 0p1pmgPEBBxVrqLxQBLKR3sJ/9d3YKWZF6QRisLkvNFCBpgz3W2FjHtZmgk4ajxtyBrpQJ blNz2+MERpT0euaDUUdA7u+APHptOl7kI58rI1BgqzKEUS89mEGx66eM2MBLrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753804; 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=by4fho9CoOHb33sYWbejBhNiDwTeUB5n+PchPM7+IZQ=; b=Nd91oSVnSjxG5TRzAat/h1dthrhLmUZAAAB49QkgFtxDZLMVnpars/ijn1WgK5uG5qBs6t GGD+7pAp/1sDufkxImgR3fAdFXwzjGSFcDPi3j/FwpTq4fNSHIrSm3H2PmiaUUX1TIg/pr sqBCMHpO/Wf33JXdX658g1IrvNO+0iOKT4LKerg98zTZTGBYnARShDPKdnVmhKFcyhksPN v8iTFUvfOyzW7WfHM4WliStvU2eU5iTVc+oIoE6skUnF6lrMSAAHfx03S9qXuUqmP35g6i U3wRDjL2TtBGnLD7Ppl87z/8kXXJVgCtRFb18PYmA3z9jjM709iQWYR1Y7gb8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753804; a=rsa-sha256; cv=none; b=eupl8v2oD35V7oflAu+d/UPgqoYtWgtLlq4grwQhhXu7aIgSAVEREPf6IxuBcek281Pumm Ux2I2Npqu7xVEDqmvXeoVCeMzYla/3k5v7ZzJdE4opho0XK6Uaswf2fxWrmpGMonD7lTp5 /l3gn88QLhqdyEt0dIZvlU7omGiQzySuWgX04QsNh1KVOA7/tyMWNfysYeKIDJgPy45AWa 4uVWByeoNbO+Oc+iJS59u0AaaRLO5QqHx1rdxrU0KzBrDlI/9mPEVcyZDFxR91FSrHoSNf O3KF3rjij//DKt5zzmJlewRZYB+alt0puPN9KjNoEOO/Yu9KAwNidn9VEz64AA== 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 4Q7hB42STzzYbC; Sat, 29 Apr 2023 07:36:44 +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 33T7aiPU064088; Sat, 29 Apr 2023 07:36:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7aiTX064087; Sat, 29 Apr 2023 07:36:44 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:36:44 GMT Message-Id: <202304290736.33T7aiTX064087@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: 405cd10f3739 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 405cd10f3739d00e48d9dce1f63bbc54ec3245d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=405cd10f3739d00e48d9dce1f63bbc54ec3245d2 commit 405cd10f3739d00e48d9dce1f63bbc54ec3245d2 Author: Dimitry Andric AuthorDate: 2023-04-17 16:25:30 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:22:43 +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 9830bc5bed5c..ff438f2ed1b6 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