From: Greg Kroah-Hartman Date: Fri, 29 Mar 2024 13:25:15 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v6.7.12~136 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba492864968ec9173119d2f26da6116a9ba58ae8;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: powerpc-xor_vmx-add-mhard-float-to-cflags.patch --- diff --git a/queue-5.4/powerpc-xor_vmx-add-mhard-float-to-cflags.patch b/queue-5.4/powerpc-xor_vmx-add-mhard-float-to-cflags.patch new file mode 100644 index 00000000000..7ef731c2713 --- /dev/null +++ b/queue-5.4/powerpc-xor_vmx-add-mhard-float-to-cflags.patch @@ -0,0 +1,44 @@ +From c6cb80d94871cbb4ff151f7eb2586cadeb364ef7 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Sat, 27 Jan 2024 11:07:43 -0700 +Subject: powerpc: xor_vmx: Add '-mhard-float' to CFLAGS + +From: Nathan Chancellor + +commit 35f20786c481d5ced9283ff42de5c69b65e5ed13 upstream. + +arch/powerpc/lib/xor_vmx.o is built with '-msoft-float' (from the main +powerpc Makefile) and '-maltivec' (from its CFLAGS), which causes an +error when building with clang after a recent change in main: + + error: option '-msoft-float' cannot be specified with '-maltivec' + make[6]: *** [scripts/Makefile.build:243: arch/powerpc/lib/xor_vmx.o] Error 1 + +Explicitly add '-mhard-float' before '-maltivec' in xor_vmx.o's CFLAGS +to override the previous inclusion of '-msoft-float' (as the last option +wins), which matches how other areas of the kernel use '-maltivec', such +as AMDGPU. + +Cc: stable@vger.kernel.org +Closes: https://github.com/ClangBuiltLinux/linux/issues/1986 +Link: https://github.com/llvm/llvm-project/commit/4792f912b232141ecba4cbae538873be3c28556c +Signed-off-by: Nathan Chancellor +Signed-off-by: Michael Ellerman +Link: https://msgid.link/20240127-ppc-xor_vmx-drop-msoft-float-v1-1-f24140e81376@kernel.org +[nathan: Fixed conflicts due to lack of 04e85bbf71c9 in older trees] +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/lib/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/powerpc/lib/Makefile ++++ b/arch/powerpc/lib/Makefile +@@ -61,6 +61,6 @@ obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o + obj-$(CONFIG_FTR_FIXUP_SELFTEST) += feature-fixups-test.o + + obj-$(CONFIG_ALTIVEC) += xor_vmx.o xor_vmx_glue.o +-CFLAGS_xor_vmx.o += -maltivec $(call cc-option,-mabi=altivec) ++CFLAGS_xor_vmx.o += -mhard-float -maltivec $(call cc-option,-mabi=altivec) + + obj-$(CONFIG_PPC64) += $(obj64-y) diff --git a/queue-5.4/series b/queue-5.4/series index 24bcd76be7a..d080815650c 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -105,3 +105,4 @@ loop-check-for-overflow-while-configuring-loop.patch loop-loop_set_status_from_info-check-before-assignment.patch perf-core-fix-reentry-problem-in-perf_output_read_group.patch efivarfs-request-at-most-512-bytes-for-variable-names.patch +powerpc-xor_vmx-add-mhard-float-to-cflags.patch