arm: include: asm: unified: mask .syntax unified for clang

It allows to build samples/bpf for arm on target board. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
ikhorn · Aug 13, 2019 · aa645cc · aa645cc
1 parent 2c6c6d5
commit aa645cc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/arch/arm/include/asm/swab.h b/arch/arm/include/asm/swab.h
@@ -25,8 +25,11 @@ static inline __attribute_const__ __u32 __arch_swahb32(__u32 x)
 	__asm__ ("rev16 %0, %1" : "=r" (x) : "r" (x));
 	return x;
 }
+
+#ifndef CONFIG_BUILD_CLANG_BPF
 #define __arch_swahb32 __arch_swahb32
 #define __arch_swab16(x) ((__u16)__arch_swahb32(x))
+#endif
 
 static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
 {

diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h
@@ -11,7 +11,13 @@
 #if defined(__ASSEMBLY__)
 	.syntax unified
 #else
-__asm__(".syntax unified");
+
+#ifdef CONFIG_BUILD_CLANG_BPF
+#pragma clang diagnostic ".syntax unified" ignored
+#else
+	__asm__(".syntax unified");
+#endif
+
 #endif
 
 #ifdef CONFIG_CPU_V7M

diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
@@ -286,6 +286,7 @@ $(obj)/%.o: $(src)/%.c
 		-D__KERNEL__ -D__BPF_TRACING__ -Wno-unused-value -Wno-pointer-sign \
 		-D__TARGET_ARCH_$(SRCARCH) -Wno-compare-distinct-pointer-types \
 		-D__LINUX_ARM_ARCH__=7 \
+		-DCONFIG_BUILD_CLANG_BPF \
 		-Wno-gnu-variable-sized-type-not-at-end \
 		-Wno-address-of-packed-member -Wno-tautological-compare \
 		-Wno-unknown-warning-option $(CLANG_ARCH_ARGS) \