selftests/bpf: Fix broken riscv build
[ Upstream commit 6016df8fe874e1cf36f6357d71438b384198ce06 ]
The selftests/bpf Makefile includes system include directories from
the host, when building BPF programs. On RISC-V glibc requires that
__riscv_xlen is defined. This is not the case for "clang -target bpf",
which messes up __WORDSIZE (errno.h -> ... -> wordsize.h) and breaks
the build.
By explicitly defining __risc_xlen correctly for riscv, we can
workaround this.
Fixes: 167381f3ea
("selftests/bpf: Makefile fix "missing" headers on build with -idirafter")
Signed-off-by: Björn Töpel <bjorn.topel@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Luke Nelson <luke.r.nels@gmail.com>
Link: https://lore.kernel.org/bpf/20201118071640.83773-2-bjorn.topel@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
6f8c6e7073
commit
8f6e6ec101
|
@ -144,7 +144,8 @@ endif
|
||||||
# build would have failed anyways.
|
# build would have failed anyways.
|
||||||
define get_sys_includes
|
define get_sys_includes
|
||||||
$(shell $(1) -v -E - </dev/null 2>&1 \
|
$(shell $(1) -v -E - </dev/null 2>&1 \
|
||||||
| sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }')
|
| sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') \
|
||||||
|
$(shell $(1) -dM -E - </dev/null | grep '#define __riscv_xlen ' | sed 's/#define /-D/' | sed 's/ /=/')
|
||||||
endef
|
endef
|
||||||
CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG))
|
CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG))
|
||||||
BPF_CFLAGS = -I. -I./include/uapi -I../../../include/uapi \
|
BPF_CFLAGS = -I. -I./include/uapi -I../../../include/uapi \
|
||||||
|
|
Loading…
Reference in New Issue