From 1ed4147e76fe56322c47468be8a222204c459adf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 7 Jan 2022 18:13:13 +0100 Subject: [PATCH] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for BR2_ARM_CPU_ARMV7A, but it also needs a special value for BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for ARMv5TE is identified with the "armv5te" architecture name, see https://doc.rust-lang.org/nightly/rustc/platform-support.html. We noticed this because Rust binaries wouldn't work on an ARMv5 platform (Illegal instruction). This was due to the usage of the arm-unknown-linux-gnueabi variant of the Rust standard library, which is for ARMv6. Thanks to this commit, we correctly use the armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly on ARMv5TE. A better approach would be to do the conversion from architecture options to Rust tuples in a single string symbol that also defines the supported architectures, similar to how it's done in e.g. openblas. However, that's a much bigger change. So for now, just do the easy thing and fix this one issue. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 90ea56f626..fe7404b3bd 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -102,8 +102,9 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS config BR2_PACKAGE_HOST_RUSTC_ARCH string + default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A - default BR2_ARCH if !BR2_ARM_CPU_ARMV7A + default BR2_ARCH config BR2_PACKAGE_HOST_RUSTC_ABI string