Skip to content

Commit 3537d7b

Browse files
committed
set a default linker for the other Cortex-R targets
1 parent 2c3a693 commit 3537d7b

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/librustc_target/spec/armebv7r_none_eabihf.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Targets the Cortex-R4F/R5F processor (ARMv7-R)
1212

1313
use std::default::Default;
14-
use spec::{LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
14+
use spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
1515

1616
pub fn target() -> TargetResult {
1717
Ok(Target {
@@ -24,10 +24,11 @@ pub fn target() -> TargetResult {
2424
target_os: "none".to_string(),
2525
target_env: String::new(),
2626
target_vendor: String::new(),
27-
linker_flavor: LinkerFlavor::Gcc,
27+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
2828

2929
options: TargetOptions {
3030
executables: true,
31+
linker: Some("rust-lld".to_owned()),
3132
relocation_model: "static".to_string(),
3233
panic_strategy: PanicStrategy::Abort,
3334
features: "+vfp3,+d16,+fp-only-sp".to_string(),

src/librustc_target/spec/armv7r_none_eabihf.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Targets the Little-endian Cortex-R4F/R5F processor (ARMv7-R)
1212

1313
use std::default::Default;
14-
use spec::{LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
14+
use spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
1515

1616
pub fn target() -> TargetResult {
1717
Ok(Target {
@@ -24,10 +24,11 @@ pub fn target() -> TargetResult {
2424
target_os: "none".to_string(),
2525
target_env: "".to_string(),
2626
target_vendor: "".to_string(),
27-
linker_flavor: LinkerFlavor::Gcc,
27+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
2828

2929
options: TargetOptions {
3030
executables: true,
31+
linker: Some("rust-lld".to_owned()),
3132
relocation_model: "static".to_string(),
3233
panic_strategy: PanicStrategy::Abort,
3334
features: "+vfp3,+d16,+fp-only-sp".to_string(),

0 commit comments

Comments
 (0)