From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A48B223702; Mon, 10 Mar 2025 17:43:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628587; cv=none; b=jWMXosBWZH7X2Zxor9qsOmHs5+0R3UfD+huytTAfqGmumkwNSVieSam2FvUFoIMmPJbINyV+GuRtElM6FUhOr/zgo8QKQbeCFJH58i+SFQq5CXSjljryweNqiqiUy+E1bCxo5sE1wTQyYjDNczExA+TZUbyaLqsXxhMH86KOsns= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628587; c=relaxed/simple; bh=D3hRvTJHLpzD0qcxp8KQa4hh2uj5Igug4alj80IJ+fE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Zbo4LTTlP4DMDoMoaTwfu04RNc9Y2VYL3BH9Dd11sHlOPtAsxiCIDjjRQCTd+DtlqZjykizxtiOjqNVOIHDXcnxnoTUbWcgfqSH4eaWXAsSx1GkxBtC2CqWwnM8Y+dGzMZYVqyyHNzRCI4/QdYdkUvRYbDkwN1FBlHYfXeJFwSo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=v6H9duFS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="v6H9duFS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84A5BC4CEE5; Mon, 10 Mar 2025 17:43:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741628586; bh=D3hRvTJHLpzD0qcxp8KQa4hh2uj5Igug4alj80IJ+fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v6H9duFS8ppGVy/JKvDxMm4pDYfZSKmlKO7vRW8meXzXgSsldt3dTrKiBpOXN1kjU XhWV4aLZU1Btu3AfH4ERdTg4+SVDEJ1GnhkwCxpe9Cqf/NBrP6bIpcEK+1/VhP/S+p 3EDw8J5kBhJMq5w1te6VLFOF5fW86ooPQMLsQRhM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Nathan Chancellor , Masahiro Yamada Subject: [PATCH 6.1 109/109] kbuild: userprogs: use correct lld when linking through clang Date: Mon, 10 Mar 2025 18:07:33 +0100 Message-ID: <20250310170431.892320782@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170427.529761261@linuxfoundation.org> References: <20250310170427.529761261@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Thomas Weißschuh" commit dfc1b168a8c4b376fa222b27b97c2c4ad4b786e1 upstream. The userprog infrastructure links objects files through $(CC). Either explicitly by manually calling $(CC) on multiple object files or implicitly by directly compiling a source file to an executable. The documentation at Documentation/kbuild/llvm.rst indicates that ld.lld would be used for linking if LLVM=1 is specified. However clang instead will use either a globally installed cross linker from $PATH called ${target}-ld or fall back to the system linker, which probably does not support crosslinking. For the normal kernel build this is not an issue because the linker is always executed directly, without the compiler being involved. Explicitly pass --ld-path to clang so $(LD) is respected. As clang 13.0.1 is required to build the kernel, this option is available. Fixes: 7f3a59db274c ("kbuild: add infrastructure to build userspace programs") Cc: stable@vger.kernel.org # needs wrapping in $(cc-option) for < 6.9 Signed-off-by: Thomas Weißschuh Reviewed-by: Nathan Chancellor Signed-off-by: Masahiro Yamada [nathan: use cc-option for 6.6 and older, as those trees support back to clang-11] Signed-off-by: Nathan Chancellor Signed-off-by: Greg Kroah-Hartman --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) --- a/Makefile +++ b/Makefile @@ -1127,6 +1127,11 @@ endif KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) +# userspace programs are linked via the compiler, use the correct linker +ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy) +KBUILD_USERLDFLAGS += $(call cc-option, --ld-path=$(LD)) +endif + # make the checker run with the right architecture CHECKFLAGS += --arch=$(ARCH)