diff options
| author | Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> | 2019-10-11 03:27:58 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-10-12 16:08:59 -0700 |
| commit | 0e865aedad571b93b2d8bb780f17befd5ee4b308 (patch) | |
| tree | 163526c12e274dfe7551dda3db6ff31a1dd97aad /samples | |
| parent | 2a560df7c147abcced2ff8c3b5572e0b1b36ac3f (diff) | |
| download | linux-stable-0e865aedad571b93b2d8bb780f17befd5ee4b308.tar.gz linux-stable-0e865aedad571b93b2d8bb780f17befd5ee4b308.tar.bz2 linux-stable-0e865aedad571b93b2d8bb780f17befd5ee4b308.zip | |
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
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/bpf/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index cf882e43648a..9b33e7395eac 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -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 |