]> git.lizzy.rs Git - rust.git/commitdiff
set a default linker for the other Cortex-R targets
authorJorge Aparicio <jorge@japaric.io>
Fri, 24 Aug 2018 17:18:11 +0000 (19:18 +0200)
committerJorge Aparicio <jorge@japaric.io>
Sun, 26 Aug 2018 09:27:05 +0000 (11:27 +0200)
src/librustc_target/spec/armebv7r_none_eabihf.rs
src/librustc_target/spec/armv7r_none_eabihf.rs

index e75e05eb945c76224c1df37cca6039a8d2877216..f5e1f8ff8df7ccd65083c7b7fbb3e9f659e98618 100644 (file)
@@ -11,7 +11,7 @@
 // Targets the Cortex-R4F/R5F processor (ARMv7-R)
 
 use std::default::Default;
-use spec::{LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
+use spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
 
 pub fn target() -> TargetResult {
     Ok(Target {
@@ -24,10 +24,11 @@ pub fn target() -> TargetResult {
         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 {
             executables: true,
+            linker: Some("rust-lld".to_owned()),
             relocation_model: "static".to_string(),
             panic_strategy: PanicStrategy::Abort,
             features: "+vfp3,+d16,+fp-only-sp".to_string(),
index e885440d094f83a9c9734576dc637e29795abd42..713624ec7b2142b2e9835c354b146d97280b16f7 100644 (file)
@@ -11,7 +11,7 @@
 // Targets the Little-endian Cortex-R4F/R5F processor (ARMv7-R)
 
 use std::default::Default;
-use spec::{LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
+use spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
 
 pub fn target() -> TargetResult {
     Ok(Target {
@@ -24,10 +24,11 @@ pub fn target() -> TargetResult {
         target_os: "none".to_string(),
         target_env: "".to_string(),
         target_vendor: "".to_string(),
-        linker_flavor: LinkerFlavor::Gcc,
+        linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
 
         options: TargetOptions {
             executables: true,
+            linker: Some("rust-lld".to_owned()),
             relocation_model: "static".to_string(),
             panic_strategy: PanicStrategy::Abort,
             features: "+vfp3,+d16,+fp-only-sp".to_string(),