Commit 9db95838 authored by Abhijit Ayarekar's avatar Abhijit Ayarekar Committed by David S. Miller
Browse files

bpf: Add -target to clang switch while cross compiling. 



Update to llvm excludes assembly instructions.
llvm git revision is below

commit 65fad7c26569 ("bpf: add inline-asm support")

This change will be part of llvm  release 6.0

__ASM_SYSREG_H define is not required for native compile.
-target switch includes appropriate target specific files
while cross compiling

Tested on x86 and arm64.

Signed-off-by: default avatarAbhijit Ayarekar <abhijit.ayarekar@caviumnetworks.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 745482e0

samples/bpf/Makefile

+3 −2
Original line number Original line Diff line number Diff line
@@ -180,6 +180,7 @@ CLANG ?= clang 
# Detect that we're cross compiling and use the cross compiler

# Detect that we're cross compiling and use the cross compiler

ifdef CROSS_COMPILE

ifdef CROSS_COMPILE

HOSTCC = $(CROSS_COMPILE)gcc

HOSTCC = $(CROSS_COMPILE)gcc

CLANG_ARCH_ARGS = -target $(ARCH)

endif

endif





# Trick to allow make to be run from this directory

# Trick to allow make to be run from this directory
@@ -229,9 +230,9 @@ $(obj)/tracex5_kern.o: $(obj)/syscall_nrs.h 
$(obj)/%.o: $(src)/%.c

$(obj)/%.o: $(src)/%.c

	$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) -I$(obj) \

	$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) -I$(obj) \

		-I$(srctree)/tools/testing/selftests/bpf/ \

		-I$(srctree)/tools/testing/selftests/bpf/ \

		-D__KERNEL__ -D__ASM_SYSREG_H -Wno-unused-value -Wno-pointer-sign \

		-D__KERNEL__ -Wno-unused-value -Wno-pointer-sign \

		-D__TARGET_ARCH_$(ARCH) -Wno-compare-distinct-pointer-types \

		-D__TARGET_ARCH_$(ARCH) -Wno-compare-distinct-pointer-types \

		-Wno-gnu-variable-sized-type-not-at-end \

		-Wno-gnu-variable-sized-type-not-at-end \

		-Wno-address-of-packed-member -Wno-tautological-compare \

		-Wno-address-of-packed-member -Wno-tautological-compare \

		-Wno-unknown-warning-option \

		-Wno-unknown-warning-option $(CLANG_ARCH_ARGS) \

		-O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=obj -o $@
 
		-O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=obj -o $@

CRA Git | Maintained and supported by SUSTech CRA and CCSE