tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

tools build: Fix rust cross compilation

Currently no target is specified to compile rust code when needed, which
breaks cross compilation. E.g. for arm64:

LD /tmp/build/tests/workloads/perf-test-in.o
aarch64-linux-gnu-ld: /tmp/build/tests/workloads/code_with_type.a(code_with_type.code_with_type.d12f4324cb53c560-cgu.0.rcgu.o): Relocations in generic ELF (EM: 62)
aarch64-linux-gnu-ld: /tmp/build/tests/workloads/code_with_type.a(code_with_type.code_with_type.d12f4324cb53c560-cgu.0.rcgu.o): Relocations in generic ELF (EM: 62)
[...repeated...]
aarch64-linux-gnu-ld: /tmp/build/tests/workloads/code_with_type.a(code_with_type.code_with_type.d12f4324cb53c560-cgu.0.rcgu.o): Relocations in generic ELF (EM: 62)
aarch64-linux-gnu-ld: /tmp/build/tests/workloads/code_with_type.a(code_with_type.code_with_type.d12f4324cb53c560-cgu.0.rcgu.o): Relocations in generic ELF (EM: 62)
aarch64-linux-gnu-ld: /tmp/build/tests/workloads/code_with_type.a: error adding symbols: file in wrong format
make[5]: *** [/perf/tools/build/Makefile.build:162: /tmp/build/tests/workloads/perf-test-in.o] Error 1
make[4]: *** [/perf/tools/build/Makefile.build:156: workloads] Error 2
make[3]: *** [/perf/tools/build/Makefile.build:156: tests] Error 2
make[2]: *** [Makefile.perf:785: /tmp/build/perf-test-in.o] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile.perf:289: sub-make] Error 2
make: *** [Makefile:76: all] Error 2

Detect required target and pass it via rust_flags to the compiler.

Note that CROSS_COMPILE might be different from what rust compiler
expects, since it may omit the target vendor value, e.g.
"aarch64-linux-gnu" instead of "aarch64-unknown-linux-gnu".

Thus explicitly map supported CROSS_COMPILE values to corresponding Rust
versions, as suggested by Miguel Ojeda.

Tested using arm64 cross-compilation example from [1].

Fixes: 2e05bb52a12d3cdb ("perf test workload: Add code_with_type test workload")
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Levi Zim <i@kxxt.dev>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nicolas Schier <nsc@kernel.org>
Link: https://perfwiki.github.io/main/arm64-cross-compilation-dockerfile/ [1]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Dmitrii Dolgov and committed by
Arnaldo Carvalho de Melo 30f998c9 b6712d91

+28 -1
+9
tools/build/Build.include
··· 99 99 cxx_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXXFLAGS_$(basetarget).o) $(CXXFLAGS_$(obj)) 100 100 101 101 ### 102 + # Rust flags to be used on rule definition, includes: 103 + # - global $(RUST_FLAGS) 104 + # - per target Rust flags 105 + # - per object Rust flags 106 + rust_flags_1 = $(RUST_FLAGS) $(RUST_FLAGS_$(basetarget).o) $(RUST_FLAGS_$(obj)) 107 + rust_flags_2 = $(filter-out $(RUST_FLAGS_REMOVE_$(basetarget).o), $(rust_flags_1)) 108 + rust_flags = $(filter-out $(RUST_FLAGS_REMOVE_$(obj)), $(rust_flags_2)) 109 + 110 + ### 102 111 ## HOSTCC C flags 103 112 104 113 host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(HOSTCFLAGS) -D"BUILD_STR(s)=\#s" $(HOSTCFLAGS_$(basetarget).o) $(HOSTCFLAGS_$(obj))
+18
tools/perf/Makefile.config
··· 1163 1163 CFLAGS += -DHAVE_RUST_SUPPORT 1164 1164 $(call detected,CONFIG_RUST_SUPPORT) 1165 1165 endif 1166 + 1167 + ifneq ($(CROSS_COMPILE),) 1168 + RUST_TARGET_FLAGS_arm := arm-unknown-linux-gnueabi 1169 + RUST_TARGET_FLAGS_arm64 := aarch64-unknown-linux-gnu 1170 + RUST_TARGET_FLAGS_m68k := m68k-unknown-linux-gnu 1171 + RUST_TARGET_FLAGS_mips := mipsel-unknown-linux-gnu 1172 + RUST_TARGET_FLAGS_powerpc := powerpc64le-unknown-linux-gnu 1173 + RUST_TARGET_FLAGS_riscv := riscv64gc-unknown-linux-gnu 1174 + RUST_TARGET_FLAGS_s390 := s390x-unknown-linux-gnu 1175 + RUST_TARGET_FLAGS_x86 := x86_64-unknown-linux-gnu 1176 + RUST_TARGET_FLAGS_x86_64 := x86_64-unknown-linux-gnu 1177 + 1178 + ifeq ($(RUST_TARGET_FLAGS_$(ARCH)),) 1179 + $(error Unknown rust cross compilation architecture $(ARCH)) 1180 + endif 1181 + 1182 + RUST_FLAGS += --target=$(RUST_TARGET_FLAGS_$(ARCH)) 1183 + endif 1166 1184 endif 1167 1185 1168 1186 # Among the variables below, these:
+1 -1
tools/perf/Makefile.perf
··· 274 274 PYLINT := $(shell which pylint 2> /dev/null) 275 275 endif 276 276 277 - export srctree OUTPUT RM CC CXX RUSTC LD AR CFLAGS CXXFLAGS V BISON FLEX AWK 277 + export srctree OUTPUT RM CC CXX RUSTC LD AR CFLAGS CXXFLAGS RUST_FLAGS V BISON FLEX AWK 278 278 export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT 279 279 280 280 include $(srctree)/tools/build/Makefile.include