From nobody Sat May 14 20:07:26 2022 X-Original-To: dev-commits-src-main@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 8F08F1AE020F; Sat, 14 May 2022 20:07:26 +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 4L0xPp3NkXz4XGg; Sat, 14 May 2022 20:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652558846; 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=i4uxphnMyMWxPqxi0bNjJhbziQMllHARoUKeY3eyLC8=; b=VU3p9bwX9voV9AdmRedjuiB35sFHngeJbTPP/vC0mipUOoxNi6RB+KxjgieuW4yLANwHkP Orm5lFKJp2KF8vdZtjnn1a6xAbtYjiAH6IbGHXmuAOzim98lSgV5UJqJytg5/s30P45czg 9lmpKRzhsji7q9FKrKW/7Xd71dCsP8wIIXUg6g6s4VAiwORTSEBl1Was8taEH3b4oqzUoN MKC84QTpcVN60txy5Y++xL7gzT/5u8CSy/s2gyPEyDx2VCfDw1gj/iz5jEaPO3w8EcECRa hGXtdYjf+YbGrxNNgE40sz1GFsXP2E2d/BpcB1zsE8YNCd1jwBEdTF5FZE3PLA== 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 53D651D0F6; Sat, 14 May 2022 20:07:26 +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 24EK7Qhg091702; Sat, 14 May 2022 20:07:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24EK7Q7A091701; Sat, 14 May 2022 20:07:26 GMT (envelope-from git) Date: Sat, 14 May 2022 20:07:26 GMT Message-Id: <202205142007.24EK7Q7A091701@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: 0817c8dc2a48 - main - Avoid adding -d to kernel module link command lines for lld >= 14 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0817c8dc2a48efedac38d1b9b5c4747a15dbe840 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652558846; 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=i4uxphnMyMWxPqxi0bNjJhbziQMllHARoUKeY3eyLC8=; b=AfzdgqrwjxN9LA5jocq9lyOlBrBNTrTBGXTUcE3eoOijAaGGUg8AnmOjq6vZygbn2e85wh iKWilh3Y7oPxoh/7Zq1pFsfzKmPwgScRse3uLhymYkWYWFXPP1Y6csEK7Ry1pvqKgMEqhh 5kcmArGvoS7xg3wwY412yneo9POtFYW73MVQyW0dc7lB3zh2iG/IYhWRdy8QnXOu+VnmpE 5ty2+Za5WCpkPeektCO5A0fa2aknMVqT2jUXgcclom5Edz/bLjqR19RFKZZu9Y2tbrqVxX tpAJWU6lhP2ymPeukTM5ytFP/mgAlNg1CAFhh/oQ7wYGiMKAL9WOpfQIgJTuIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652558846; a=rsa-sha256; cv=none; b=ptY8rNyzBs9uZYjxt1Nx+c4THWYQUt4xHs0vTdL83Y8Udo7+/q4cqRfz7FZzOfUE66Q7To vzUYtYp74G0GAnzSm0mZ8y811sOxp3ql8o4hQOIS+SqTLboFCO8bzA3MWR8B5GmO14If1a hgwgxxFEKAEtiqnXFfm3VxxsX3yUXjGBCKlNhGO8KNqc/DHoiq8PuFdPp9C9AB6WqITvSS SGnmdaymzXt/ai3xuo35DZlSVcDEQRY2a+spATFR1mLQfIN2Zo+ahkVzVpIjlFoik7egLb o4yVhy6WtzkSQsa3W+xXPhwfAEp/d16n8wJKnS+1Fv3nNLhKkvwxjh0pIfpsIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0817c8dc2a48efedac38d1b9b5c4747a15dbe840 commit 0817c8dc2a48efedac38d1b9b5c4747a15dbe840 Author: Dimitry Andric AuthorDate: 2022-05-14 20:07:01 +0000 Commit: Dimitry Andric CommitDate: 2022-05-14 20:07:12 +0000 Avoid adding -d to kernel module link command lines for lld >= 14 Since 0b3178a45cd0 we have added '-d' to the link command line for kernel modules, so if any unexpected common symbols turn up (even though we use -fno-common in CFLAGS), storage will be allocated in in the module itself. However, with lld this option did not have any effect since ~2017, and as of lld 14 it warns: "-d, -dc, -dp, and --[no-]define-common will be removed. See https://github.com/llvm/llvm-project/issues/53660" Add a linker type and version check, to avoid adding the option for lld 14 and later. Reported by: bz MFC after: 2 weeks --- sys/conf/kmod.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index e01a982d4793..2ab8fb576472 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -145,7 +145,11 @@ CFLAGS.gcc+= --param large-function-growth=1000 # share/mk/src.sys.mk, but the following is important for out-of-tree modules # (e.g. ports). CFLAGS+= -fno-common -LDFLAGS+= -d -warn-common +.if ${LINKER_TYPE} != "lld" || ${LINKER_VERSION} < 140000 +# lld >= 14 warns that -d is deprecated, and will be removed. +LDFLAGS+= -d +.endif +LDFLAGS+= -warn-common .if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id} LDFLAGS+= --build-id=sha1 @@ -247,7 +251,7 @@ ${KMOD}.kld: ${OBJS} ${BLOB_OBJS} .else ${FULLPROG}: ${OBJS} ${BLOB_OBJS} .endif - ${LD} -m ${LD_EMULATION} ${_LDFLAGS} ${LDSCRIPT_FLAGS} -r -d \ + ${LD} -m ${LD_EMULATION} ${_LDFLAGS} ${LDSCRIPT_FLAGS} -r \ -o ${.TARGET} ${OBJS} ${BLOB_OBJS} .if ${MK_CTF} != "no" ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} ${BLOB_OBJS}