Added armv7-none target instead of arm-none

Author: Gilnaa

src/ci/docker/dist-various-1/Dockerfile

@@ -120,15 +120,15 @@ ENV TARGETS=$TARGETS,armebv7r-none-eabi
 ENV TARGETS=$TARGETS,armebv7r-none-eabihf
 ENV TARGETS=$TARGETS,armv7r-none-eabi
 ENV TARGETS=$TARGETS,armv7r-none-eabihf
-ENV TARGETS=$TARGETS,arm-none-eabi
+ENV TARGETS=$TARGETS,armv7-none-eabihf
 ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
 
 ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
     CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \
     CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
     CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \
     CC_armebv7r_none_eabi=arm-none-eabi-gcc \
-    CC_arm_none_eabi=arm-none-eabi-gcc \
+    CC_armv7_none_eabihf=arm-none-eabi-gcc \
     CC_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
     AR_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-ar \
     CXX_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++

src/librustc_target/spec/arm_none_eabi.rs renamed to src/librustc_target/spec/armv7_none_eabihf.rs

@@ -6,11 +6,11 @@
 //
 // For example, `-C target-cpu=cortex-a7`.
 
-use super::{LinkerFlavor, Target, TargetOptions, PanicStrategy};
+use crate::spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
 
-pub fn target() -> Result<Target, String> {
+pub fn target() -> TargetResult {
     Ok(Target {
-        llvm_target: "arm-none-eabi".to_string(),
+        llvm_target: "armv7-none-eabihf".to_string(),
         target_endian: "little".to_string(),
         target_pointer_width: "32".to_string(),
         target_c_int_width: "32".to_string(),
@@ -19,10 +19,11 @@ pub fn target() -> Result<Target, String> {
         target_os: "none".to_string(),
         target_env: String::new(),
         target_vendor: String::new(),
-        linker_flavor: LinkerFlavor::Gcc,
+        linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
 
         options: TargetOptions {
-            features: "+strict-align,+v6".to_string(),
+            features: "+v7,+vfp3,+d16,+thumb2,-neon".to_string(),
+            linker: Some("rust-lld".to_owned()),
             executables: true,
             relocation_model: "static".to_string(),
             max_atomic_width: Some(64),

src/librustc_target/spec/mod.rs

@@ -351,7 +351,7 @@ supported_targets! {
     ("s390x-unknown-linux-gnu", s390x_unknown_linux_gnu),
     ("sparc-unknown-linux-gnu", sparc_unknown_linux_gnu),
     ("sparc64-unknown-linux-gnu", sparc64_unknown_linux_gnu),
-    ("arm-none-eabi", arm_none_eabi),
+    ("armv7-none-eabihf", armv7_none_eabihf),
     ("arm-unknown-linux-gnueabi", arm_unknown_linux_gnueabi),
     ("arm-unknown-linux-gnueabihf", arm_unknown_linux_gnueabihf),
     ("arm-unknown-linux-musleabi", arm_unknown_linux_musleabi),

src/tools/build-manifest/src/main.rs

@@ -49,7 +49,6 @@ static TARGETS: &[&str] = &[
     "aarch64-unknown-linux-gnu",
     "aarch64-unknown-linux-musl",
     "arm-linux-androideabi",
-    "arm-none-eabi",
     "arm-unknown-linux-gnueabi",
     "arm-unknown-linux-gnueabihf",
     "arm-unknown-linux-musleabi",
@@ -67,6 +66,7 @@ static TARGETS: &[&str] = &[
     "armv7r-none-eabi",
     "armv7r-none-eabihf",
     "armv7s-apple-ios",
+    "armv7-none-eabihf",
     "asmjs-unknown-emscripten",
     "i386-apple-ios",
     "i586-pc-windows-msvc",