Skip to content

Commit d65a64e

Browse files
committed
change the default linker of the ARM Cortex-M targets
to rust-lld so users won't need an external linker to build programs
1 parent 727eabd commit d65a64e

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

src/librustc_target/spec/thumb_base.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ pub fn opts() -> TargetOptions {
4242
// See rust-lang/rfcs#1645 for a discussion about these defaults
4343
TargetOptions {
4444
executables: true,
45-
// In 99%+ of cases, we want to use the `arm-none-eabi-gcc` compiler (there aren't many
46-
// options around)
47-
linker: Some("arm-none-eabi-gcc".to_string()),
45+
// In most cases, LLD is good enough
46+
linker: Some("rust-lld".to_string()),
4847
// Because these devices have very little resources having an unwinder is too onerous so we
4948
// default to "abort" because the "unwind" strategy is very rare.
5049
panic_strategy: PanicStrategy::Abort,

src/librustc_target/spec/thumbv6m_none_eabi.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// Targets the Cortex-M0, Cortex-M0+ and Cortex-M1 processors (ARMv6-M architecture)
1212

13-
use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
13+
use spec::{LinkerFlavor, LldFlavor, Target, TargetOptions, TargetResult};
1414

1515
pub fn target() -> TargetResult {
1616
Ok(Target {
@@ -23,7 +23,7 @@ pub fn target() -> TargetResult {
2323
target_os: "none".to_string(),
2424
target_env: String::new(),
2525
target_vendor: String::new(),
26-
linker_flavor: LinkerFlavor::Gcc,
26+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
2727

2828
options: TargetOptions {
2929
// The ARMv6-M architecture doesn't support unaligned loads/stores so we disable them

src/librustc_target/spec/thumbv7em_none_eabi.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// To opt-in to hardware accelerated floating point operations, you can use, for example,
2020
// `-C target-feature=+vfp4` or `-C target-cpu=cortex-m4`.
2121

22-
use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
22+
use spec::{LinkerFlavor, LldFlavor, Target, TargetOptions, TargetResult};
2323

2424
pub fn target() -> TargetResult {
2525
Ok(Target {
@@ -32,7 +32,7 @@ pub fn target() -> TargetResult {
3232
target_os: "none".to_string(),
3333
target_env: String::new(),
3434
target_vendor: String::new(),
35-
linker_flavor: LinkerFlavor::Gcc,
35+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
3636

3737
options: TargetOptions {
3838
max_atomic_width: Some(32),

src/librustc_target/spec/thumbv7em_none_eabihf.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//
1919
// To opt into double precision hardware support, use the `-C target-feature=-fp-only-sp` flag.
2020

21-
use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
21+
use spec::{LinkerFlavor, LldFlavor, Target, TargetOptions, TargetResult};
2222

2323
pub fn target() -> TargetResult {
2424
Ok(Target {
@@ -31,7 +31,7 @@ pub fn target() -> TargetResult {
3131
target_os: "none".to_string(),
3232
target_env: String::new(),
3333
target_vendor: String::new(),
34-
linker_flavor: LinkerFlavor::Gcc,
34+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
3535

3636
options: TargetOptions {
3737
// `+vfp4` is the lowest common denominator between the Cortex-M4 (vfp4-16) and the

src/librustc_target/spec/thumbv7m_none_eabi.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// Targets the Cortex-M3 processor (ARMv7-M)
1212

13-
use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
13+
use spec::{LinkerFlavor, LldFlavor, Target, TargetOptions, TargetResult};
1414

1515
pub fn target() -> TargetResult {
1616
Ok(Target {
@@ -23,7 +23,7 @@ pub fn target() -> TargetResult {
2323
target_os: "none".to_string(),
2424
target_env: String::new(),
2525
target_vendor: String::new(),
26-
linker_flavor: LinkerFlavor::Gcc,
26+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
2727

2828
options: TargetOptions {
2929
max_atomic_width: Some(32),

0 commit comments

Comments
 (0)