Commit 0e865aed authored Oct 11, 2019 by Ivan Khoronzhuk Committed by Alexei Starovoitov Oct 12, 2019

samples/bpf: Use __LINUX_ARM_ARCH__ selector for arm

For arm, -D__LINUX_ARM_ARCH__=X is min version used as instruction
set selector and is absolutely required while parsing some parts of
headers. It's present in KBUILD_CFLAGS but not in autoconf.h, so let's
retrieve it from and add to programs cflags. In another case errors
like "SMP is not supported" for armv7 and bunch of other errors are
issued resulting to incorrect final object.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20191011002808.28206-6-ivan.khoronzhuk@linaro.org

parent 2a560df7

samples/bpf/Makefile

+8 −0

Original line number	Diff line number	Diff line
		@@ -185,6 +185,14 @@ HOSTLDLIBS_map_perf_test += -lrt
		HOSTLDLIBS_test_overhead += -lrt
		HOSTLDLIBS_xdpsock += -pthread

		ifeq ($(ARCH), arm)
		# Strip all except -D__LINUX_ARM_ARCH__ option needed to handle linux
		# headers when arm instruction set identification is requested.
		ARM_ARCH_SELECTOR := $(filter -D__LINUX_ARM_ARCH__%, $(KBUILD_CFLAGS))
		BPF_EXTRA_CFLAGS := $(ARM_ARCH_SELECTOR)
		KBUILD_HOSTCFLAGS += $(ARM_ARCH_SELECTOR)
		endif

		# Allows pointing LLC/CLANG to a LLVM backend with bpf support, redefine on cmdline:
		# make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang
		LLC ?= llc