From: Greg Kroah-Hartman Date: Mon, 10 Mar 2025 16:42:36 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v5.4.291~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb0b17dcc93d2c047eb532b165845195094a4c24;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch --- diff --git a/queue-6.1/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch b/queue-6.1/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch new file mode 100644 index 0000000000..4ccf1474c5 --- /dev/null +++ b/queue-6.1/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch @@ -0,0 +1,50 @@ +From 89dc7c7a9f6f609fb5c9c6ed819bf99cf2e373a2 Mon Sep 17 00:00:00 2001 +From: "Thomas Weißschuh" +Date: Mon, 17 Feb 2025 08:27:54 +0100 +Subject: kbuild: userprogs: use correct lld when linking through clang + +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) + diff --git a/queue-6.1/series b/queue-6.1/series index 9180dd3a1a..0c0b0c28f0 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -106,3 +106,4 @@ fs-ntfs3-add-rough-attr-alloc_size-check.patch bpf-vsock-invoke-proto-close-on-close.patch vsock-keep-the-binding-until-socket-destruction.patch vsock-orphan-socket-after-transport-release.patch +kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch