Fixes for 6.12

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.12/kbuild-hdrcheck-fix-cross-build-with-clang.patch b/queue-6.12/kbuild-hdrcheck-fix-cross-build-with-clang.patch
new file mode 100644 (file)
index 0000000..e8d4e68
--- /dev/null
+++ b/queue-6.12/kbuild-hdrcheck-fix-cross-build-with-clang.patch
@@ -0,0 +1,45 @@
+From 8b50eb9cfd465f05bdde624da741f05a7ba204ab Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 25 Feb 2025 11:00:31 +0100
+Subject: kbuild: hdrcheck: fix cross build with clang
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+[ Upstream commit 02e9a22ceef0227175e391902d8760425fa072c6 ]
+
+The headercheck tries to call clang with a mix of compiler arguments
+that don't include the target architecture. When building e.g. x86
+headers on arm64, this produces a warning like
+
+   clang: warning: unknown platform, assuming -mfloat-abi=soft
+
+Add in the KBUILD_CPPFLAGS, which contain the target, in order to make it
+build properly.
+
+See also 1b71c2fb04e7 ("kbuild: userprogs: fix bitsize and target
+detection on clang").
+
+Reviewed-by: Nathan Chancellor <nathan@kernel.org>
+Fixes: feb843a469fb ("kbuild: add $(CLANG_FLAGS) to KBUILD_CPPFLAGS")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ usr/include/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr/include/Makefile b/usr/include/Makefile
+index 771e32872b2ab..58173cfe5ff17 100644
+--- a/usr/include/Makefile
++++ b/usr/include/Makefile
+@@ -10,7 +10,7 @@ UAPI_CFLAGS := -std=c90 -Wall -Werror=implicit-function-declaration
+ 
+ # In theory, we do not care -m32 or -m64 for header compile tests.
+ # It is here just because CONFIG_CC_CAN_LINK is tested with -m32 or -m64.
+-UAPI_CFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
++UAPI_CFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
+ 
+ # USERCFLAGS might contain sysroot location for CC.
+ UAPI_CFLAGS += $(USERCFLAGS)
+-- 
+2.39.5
+

diff --git a/queue-6.12/series b/queue-6.12/series
index e9edba510f2fafd50d50c63a787fc1d62ae14dbe..5e79d7e0bfd946e4138f63e25ccc33192285e743 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -255,3 +255,4 @@ mm-hugetlb-add-huge-page-size-param-to-huge_ptep_get_and_clear.patch
 arm64-hugetlb-fix-huge_ptep_get_and_clear-for-non-present-ptes.patch
 fs-netfs-read_pgpriv2-skip-folio-queues-without-marks3.patch
 fs-netfs-read_collect-fix-crash-due-to-uninitialized-prev-variable.patch
+kbuild-hdrcheck-fix-cross-build-with-clang.patch