Commit 313e7f6f authored by Ilya Leoshkevich's avatar Ilya Leoshkevich Committed by Daniel Borkmann
Browse files

selftest/bpf: Use -m{little, big}-endian for clang 



When cross-compiling tests from x86 to s390, the resulting BPF objects
fail to load due to endianness mismatch.

Fix by using BPF-GCC endianness check for clang as well.

Signed-off-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20191028102049.7489-1-iii@linux.ibm.com
parent 5b7fe93d

tools/testing/selftests/bpf/Makefile

+7 −6
Original line number Diff line number Diff line
@@ -131,8 +131,13 @@ $(shell $(1) -v -E - </dev/null 2>&1 \ 
	| sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }')

endef



# Determine target endianness.

IS_LITTLE_ENDIAN = $(shell $(CC) -dM -E - </dev/null | \

			grep 'define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__')

MENDIAN=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian)



CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG))

BPF_CFLAGS = -g -D__TARGET_ARCH_$(SRCARCH) 				\

BPF_CFLAGS = -g -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) 			\

	     -I. -I./include/uapi -I$(APIDIR)				\

	     -I$(BPFDIR) -I$(abspath $(OUTPUT)/../usr/include)
@@ -271,12 +276,8 @@ $(eval $(call DEFINE_TEST_RUNNER,test_progs,no_alu32)) 


# Define test_progs BPF-GCC-flavored test runner.

ifneq ($(BPF_GCC),)

IS_LITTLE_ENDIAN = $(shell $(CC) -dM -E - </dev/null | \

			grep 'define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__')

MENDIAN=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian)



TRUNNER_BPF_BUILD_RULE := GCC_BPF_BUILD_RULE

TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(call get_sys_includes,gcc) $(MENDIAN)

TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(call get_sys_includes,gcc)

TRUNNER_BPF_LDFLAGS :=

$(eval $(call DEFINE_TEST_RUNNER,test_progs,bpf_gcc))

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE