Skip to content

Commit d8cc8dc

Browse files
committed
Added armv7-none target instead of arm-none
1 parent be33738 commit d8cc8dc

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,15 @@ ENV TARGETS=$TARGETS,armebv7r-none-eabi
120120
ENV TARGETS=$TARGETS,armebv7r-none-eabihf
121121
ENV TARGETS=$TARGETS,armv7r-none-eabi
122122
ENV TARGETS=$TARGETS,armv7r-none-eabihf
123-
ENV TARGETS=$TARGETS,arm-none-eabi
123+
ENV TARGETS=$TARGETS,armv7-none-eabihf
124124
ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
125125

126126
ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
127127
CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \
128128
CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
129129
CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \
130130
CC_armebv7r_none_eabi=arm-none-eabi-gcc \
131-
CC_arm_none_eabi=arm-none-eabi-gcc \
131+
CC_armv7_none_eabihf=arm-none-eabi-gcc \
132132
CC_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
133133
AR_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-ar \
134134
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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
//
77
// For example, `-C target-cpu=cortex-a7`.
88

9-
use super::{LinkerFlavor, Target, TargetOptions, PanicStrategy};
9+
use crate::spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
1010

11-
pub fn target() -> Result<Target, String> {
11+
pub fn target() -> TargetResult {
1212
Ok(Target {
13-
llvm_target: "arm-none-eabi".to_string(),
13+
llvm_target: "armv7-none-eabihf".to_string(),
1414
target_endian: "little".to_string(),
1515
target_pointer_width: "32".to_string(),
1616
target_c_int_width: "32".to_string(),
@@ -19,10 +19,11 @@ pub fn target() -> Result<Target, String> {
1919
target_os: "none".to_string(),
2020
target_env: String::new(),
2121
target_vendor: String::new(),
22-
linker_flavor: LinkerFlavor::Gcc,
22+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
2323

2424
options: TargetOptions {
25-
features: "+strict-align,+v6".to_string(),
25+
features: "+v7,+vfp3,+d16,+thumb2,-neon".to_string(),
26+
linker: Some("rust-lld".to_owned()),
2627
executables: true,
2728
relocation_model: "static".to_string(),
2829
max_atomic_width: Some(64),

src/librustc_target/spec/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ supported_targets! {
351351
("s390x-unknown-linux-gnu", s390x_unknown_linux_gnu),
352352
("sparc-unknown-linux-gnu", sparc_unknown_linux_gnu),
353353
("sparc64-unknown-linux-gnu", sparc64_unknown_linux_gnu),
354-
("arm-none-eabi", arm_none_eabi),
354+
("armv7-none-eabihf", armv7_none_eabihf),
355355
("arm-unknown-linux-gnueabi", arm_unknown_linux_gnueabi),
356356
("arm-unknown-linux-gnueabihf", arm_unknown_linux_gnueabihf),
357357
("arm-unknown-linux-musleabi", arm_unknown_linux_musleabi),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ static TARGETS: &[&str] = &[
4949
"aarch64-unknown-linux-gnu",
5050
"aarch64-unknown-linux-musl",
5151
"arm-linux-androideabi",
52-
"arm-none-eabi",
5352
"arm-unknown-linux-gnueabi",
5453
"arm-unknown-linux-gnueabihf",
5554
"arm-unknown-linux-musleabi",
@@ -67,6 +66,7 @@ static TARGETS: &[&str] = &[
6766
"armv7r-none-eabi",
6867
"armv7r-none-eabihf",
6968
"armv7s-apple-ios",
69+
"armv7-none-eabihf",
7070
"asmjs-unknown-emscripten",
7171
"i386-apple-ios",
7272
"i586-pc-windows-msvc",

0 commit comments

Comments
 (0)