From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sun, 28 May 2023 11:13:47 +0000 (+0300)
Subject: bpf-headers: fix compilation with LLVM_IAS=1
X-Git-Tag: v22.03.6~96
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4a9eb94b5f1a1aeb2907952168605bcc9da1b4d3;p=openwrt%2Fopenwrt.git

bpf-headers: fix compilation with LLVM_IAS=1

Linux 5.10.178 includes backported commits that break the compilation
of bpf-headers, as the compilation gets confused which assembler to use.
Caused by Linux upstream commits just before the .178 tag:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/?h=v5.10.178

2023-04-20	kbuild: check CONFIG_AS_IS_LLVM instead of LLVM_IAS
2023-04-20	kbuild: Switch to 'f' variants of integrated assembler flag
2023-04-20	kbuild: check the minimum assembler version in Kconfig

Explicitly use LLVM_IAS=1 to fix things.

Fixes #12748

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
---

diff --git a/package/kernel/bpf-headers/Makefile b/package/kernel/bpf-headers/Makefile
index 0c1a02a0a1..4de0968ec1 100644
--- a/package/kernel/bpf-headers/Makefile
+++ b/package/kernel/bpf-headers/Makefile
@@ -53,7 +53,7 @@ KERNEL_MAKE := \
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		ARCH=$(BPF_KARCH) \
 		CROSS_COMPILE=$(BPF_ARCH)-linux- \
-		LLVM=1 CC="$(CLANG)" LD="$(TARGET_CROSS)ld" \
+		LLVM=1 LLVM_IAS=1 CC="$(CLANG)" LD="$(TARGET_CROSS)ld" \
 		HOSTCC="$(HOSTCC)" \
 		HOSTCXX="$(HOSTCXX)" \
 		HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib" \