From 4897093cfd858fb10ce538e86f7b549cb199db13 Mon Sep 17 00:00:00 2001 From: Paolo Teti Date: Fri, 18 May 2018 20:57:48 +0200 Subject: [PATCH] armebv7r-none-eabihf: default to ARM mode - remove +thumb2 that has not effect - remove -mthumb Tested on TMS570LS3137 --- src/ci/docker/disabled/dist-armebv7r-none-eabihf/Dockerfile | 2 +- src/librustc_target/spec/armebv7r_none_eabihf.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ci/docker/disabled/dist-armebv7r-none-eabihf/Dockerfile b/src/ci/docker/disabled/dist-armebv7r-none-eabihf/Dockerfile index 87aa5fc22c55..34c6e640abb7 100644 --- a/src/ci/docker/disabled/dist-armebv7r-none-eabihf/Dockerfile +++ b/src/ci/docker/disabled/dist-armebv7r-none-eabihf/Dockerfile @@ -29,7 +29,7 @@ ENV PATH=$PATH:/$GCC_LINARO/bin ENV TARGET=armebv7r-none-eabihf ENV CC_armebv7r_none_eabihf=armeb-eabi-gcc \ - CFLAGS_armebv7r_none_eabihf="-mthumb -march=armv7-r" + CFLAGS_armebv7r_none_eabihf="-march=armv7-r" ENV RUST_CONFIGURE_ARGS --disable-docs diff --git a/src/librustc_target/spec/armebv7r_none_eabihf.rs b/src/librustc_target/spec/armebv7r_none_eabihf.rs index 3fd5e531456a..8bd08d355a7b 100644 --- a/src/librustc_target/spec/armebv7r_none_eabihf.rs +++ b/src/librustc_target/spec/armebv7r_none_eabihf.rs @@ -30,7 +30,7 @@ pub fn target() -> TargetResult { executables: true, relocation_model: "static".to_string(), panic_strategy: PanicStrategy::Abort, - features: "+v7,+thumb2,+vfp3,+d16,+fp-only-sp".to_string(), + features: "+v7,+vfp3,+d16,+fp-only-sp".to_string(), max_atomic_width: Some(32), abi_blacklist: super::arm_base::abi_blacklist(), emit_debug_gdb_scripts: false,