From nobody Wed Dec 22 10:06:44 2021 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 3E15D1906F4D; Wed, 22 Dec 2021 10:06:53 +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 4JJprm1zlRz4Yw1; Wed, 22 Dec 2021 10:06:48 +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 23DD41B1D8; Wed, 22 Dec 2021 10:06: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 1BMA6iUE093066; Wed, 22 Dec 2021 10:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA6iSm093065; Wed, 22 Dec 2021 10:06:44 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:06:44 GMT Message-Id: <202112221006.1BMA6iSm093065@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: 06c24143c4af - stable/12 - Default to using lld for arm.arm, but disable fatal linker warnings 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 06c24143c4af8a10a65abd9f310feeb05a0d14e3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167610; 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=LgKc4tu4nJWx7HLdP0m6BaotGU5pfJ2hy2As9kHgQUc=; b=d2b2V521QQmDXhpn/8n84EQbKfdB522vPJZkrEHbU6m/27B82tQOiuDLrRcQU5w8JHyh5x Jex4RAjJx95Ko97//h7rinXOL3sMeTXihSHcRe58r3NYPEYAnaStMq/2Y3msELbRJE+Lb8 u0CmzMaZvdALK73EUtWdA2w64I00G45Z9IQBcGQWz7lNj1FjNJkiqHDd66bNxcb6YR6lpe sfvYNU/sgkuWcuC6u9+03PLN5wWNTu+tAaeDRkJ4/8s+OplZwiNhEjc3cVPR0lmd9hq1vI 4N341eSC8dQGUOj+LpDc+cYp80XRtI/asM1GyC2UfP7nfOna+mrFEumhQcNg9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167610; a=rsa-sha256; cv=none; b=b6q8sSPh5/SDQc8maCL7S+E5Hyfci4OIErbFD3FVbsdEOSwyBz0n6hTd6v5fGgUmxnfxfa 96DHvev+jPGxyTwHdNF01b9MArES60FRDj5QHIMBlLihM/ZM2KQw6LOzJQPiW+LTL5i9LB /p/eObgQnoN8kiChxH8ueTG+MlIU7D7szGBQhayP8JmPaEveTKYMC7WQYb0va6/Q3f3H6f 3GsH6MTZe+YeIx+Mfx9jCVmVIFJ1aOKScT6Q6SpEoTSUipfHGlDI91w/e2FQ2TCkRdGzMW FgckF76Vy45azWG6+fw8dO7cmA+6lBwhkUVI5gjXb8ONgQPG+VBqE4nXfFwWhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=06c24143c4af8a10a65abd9f310feeb05a0d14e3 commit 06c24143c4af8a10a65abd9f310feeb05a0d14e3 Author: Dimitry Andric AuthorDate: 2021-12-22 09:51:44 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 10:01:34 +0000 Default to using lld for arm.arm, but disable fatal linker warnings Since BFD ld 2.17.50 cannot cope with the output of clang 11 and higher, due to some object files getting more than 65k sections, we need to use lld 11 and higher instead. However, this results in warnings from lld: "lld uses blx instruction, no object with architecture supporting feature detected". At the moment we think it is safe to ignore this warning, so add a check to bsd.lib.mk to make them non-fatal by default for arm.arm. --- share/mk/bsd.lib.mk | 3 ++- share/mk/src.opts.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index d99360f0e2bf..69b64200e47f 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -280,7 +280,8 @@ CLEANFILES+= ${SOBJS} _LIBS+= ${SHLIB_NAME} SOLINKOPTS+= -shared -Wl,-x -.if defined(LD_FATAL_WARNINGS) && ${LD_FATAL_WARNINGS} == "no" +.if (defined(LD_FATAL_WARNINGS) && ${LD_FATAL_WARNINGS} == "no") || \ + (!defined(LD_FATAL_WARNINGS) && ${MACHINE_ARCH} == "arm") SOLINKOPTS+= -Wl,--no-fatal-warnings .else SOLINKOPTS+= -Wl,--fatal-warnings diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 4fd16579f863..2531f0d43264 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -329,8 +329,8 @@ __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND .else __DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND .endif -.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "armv6" || \ - ${__T} == "armv7" || ${__T} == "i386" || ${__TT} == "riscv" +.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__TT} == "arm" || \ + ${__T} == "i386" || ${__TT} == "riscv" __DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD .else __DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD