Skip to content

Commit c9bcd91

Browse files
committed
Revert linker to GCC.
1 parent bf176e2 commit c9bcd91

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/librustc_target/spec/xtensa_esp32_none_elf.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{abi::Abi, LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult, RelocModel};
1+
use crate::spec::{abi::Abi, LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult, RelocModel};
22

33
pub fn target() -> TargetResult {
44
Ok(Target {
@@ -11,13 +11,13 @@ pub fn target() -> TargetResult {
1111
target_os: "freertos".to_string(),
1212
target_env: "newlib".to_string(),
1313
target_vendor: "espressif".to_string(),
14-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
14+
linker_flavor: LinkerFlavor::Gcc,
1515

1616
options: TargetOptions {
1717
executables: true,
1818
target_family: Some("unix".to_string()),
1919
cpu: "esp32".to_string(),
20-
linker: Some("rust-lld".to_string()),
20+
linker: Some("xtensa-esp32-elf-gcc".to_string()),
2121

2222
max_atomic_width: Some(32),
2323

src/librustc_target/spec/xtensa_esp8266_none_elf.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{abi::Abi, LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult, RelocModel};
1+
use crate::spec::{abi::Abi, LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult, RelocModel};
22

33
pub fn target() -> TargetResult {
44
Ok(Target {
@@ -11,13 +11,13 @@ pub fn target() -> TargetResult {
1111
target_os: "freertos".to_string(),
1212
target_env: "newlib".to_string(),
1313
target_vendor: "espressif".to_string(),
14-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
14+
linker_flavor: LinkerFlavor::Gcc,
1515

1616
options: TargetOptions {
1717
executables: true,
1818
target_family: Some("unix".to_string()),
1919
cpu: "esp8266".to_string(),
20-
linker: Some("rust-lld".to_string()),
20+
linker: Some("xtensa-lx106-elf-gcc".to_string()),
2121

2222
max_atomic_width: Some(32),
2323

0 commit comments

Comments
 (0)