Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit d41fe05

Browse files
petrochenkovpetrochenkov
committed
rustc_target: Move linker_flavor from Target to TargetOptions 
1 parent b294cc7 commit d41fe05

File tree

159 files changed

+120
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+120
-244
lines changed

‎compiler/rustc_target/src/spec/aarch64_apple_darwin.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ pub fn target() -> Target {
1919
pointer_width: 64,
2020
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".to_string(),
2121
arch: arch.to_string(),
22-
linker_flavor: LinkerFlavor::Gcc,
2322
options: TargetOptions { target_mcount: "\u{1}mcount".to_string(), ..base },
2423
}
2524
}

‎compiler/rustc_target/src/spec/aarch64_apple_ios.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::apple_sdk_base::{opts, Arch};
2-
use crate::spec::{LinkerFlavor, Target, TargetOptions};
2+
use crate::spec::{Target, TargetOptions};
33

44
pub fn target() -> Target {
55
let base = opts("ios", Arch::Arm64);
@@ -8,7 +8,6 @@ pub fn target() -> Target {
88
pointer_width: 64,
99
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".to_string(),
1010
arch: "aarch64".to_string(),
11-
linker_flavor: LinkerFlavor::Gcc,
1211
options: TargetOptions {
1312
features: "+neon,+fp-armv8,+apple-a7".to_string(),
1413
eliminate_frame_pointer: false,

‎compiler/rustc_target/src/spec/aarch64_apple_tvos.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::apple_sdk_base::{opts, Arch};
2-
use crate::spec::{LinkerFlavor, Target, TargetOptions};
2+
use crate::spec::{Target, TargetOptions};
33

44
pub fn target() -> Target {
55
let base = opts("tvos", Arch::Arm64);
@@ -8,7 +8,6 @@ pub fn target() -> Target {
88
pointer_width: 64,
99
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".to_string(),
1010
arch: "aarch64".to_string(),
11-
linker_flavor: LinkerFlavor::Gcc,
1211
options: TargetOptions {
1312
features: "+neon,+fp-armv8,+apple-a7".to_string(),
1413
eliminate_frame_pointer: false,

‎compiler/rustc_target/src/spec/aarch64_fuchsia.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkerFlavor, LldFlavor, Target, TargetOptions};
1+
use crate::spec::{Target, TargetOptions};
22

33
pub fn target() -> Target {
44
let mut base = super::fuchsia_base::opts();
@@ -9,7 +9,6 @@ pub fn target() -> Target {
99
pointer_width: 64,
1010
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1111
arch: "aarch64".to_string(),
12-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1312
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
1413
}
1514
}

‎compiler/rustc_target/src/spec/aarch64_linux_android.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkerFlavor, Target, TargetOptions};
1+
use crate::spec::{Target, TargetOptions};
22

33
// See https://developer.android.com/ndk/guides/abis.html#arm64-v8a
44
// for target ABI requirements.
@@ -14,7 +14,6 @@ pub fn target() -> Target {
1414
pointer_width: 64,
1515
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1616
arch: "aarch64".to_string(),
17-
linker_flavor: LinkerFlavor::Gcc,
1817
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
1918
}
2019
}

‎compiler/rustc_target/src/spec/aarch64_pc_windows_msvc.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkerFlavor, Target};
1+
use crate::spec::Target;
22

33
pub fn target() -> Target {
44
let mut base = super::windows_msvc_base::opts();
@@ -11,7 +11,6 @@ pub fn target() -> Target {
1111
pointer_width: 64,
1212
data_layout: "e-m:w-p:64:64-i32:32-i64:64-i128:128-n32:64-S128".to_string(),
1313
arch: "aarch64".to_string(),
14-
linker_flavor: LinkerFlavor::Msvc,
1514
options: base,
1615
}
1716
}

‎compiler/rustc_target/src/spec/aarch64_unknown_cloudabi.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkerFlavor, Target};
1+
use crate::spec::Target;
22

33
pub fn target() -> Target {
44
let mut base = super::cloudabi_base::opts();
@@ -11,7 +11,6 @@ pub fn target() -> Target {
1111
pointer_width: 64,
1212
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1313
arch: "aarch64".to_string(),
14-
linker_flavor: LinkerFlavor::Gcc,
1514
options: base,
1615
}
1716
}

‎compiler/rustc_target/src/spec/aarch64_unknown_freebsd.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkerFlavor, Target, TargetOptions};
1+
use crate::spec::{Target, TargetOptions};
22

33
pub fn target() -> Target {
44
let mut base = super::freebsd_base::opts();
@@ -9,7 +9,6 @@ pub fn target() -> Target {
99
pointer_width: 64,
1010
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1111
arch: "aarch64".to_string(),
12-
linker_flavor: LinkerFlavor::Gcc,
1312
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
1413
}
1514
}

‎compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkerFlavor, LldFlavor, Target};
1+
use crate::spec::Target;
22

33
pub fn target() -> Target {
44
let mut base = super::hermit_base::opts();
@@ -9,7 +9,6 @@ pub fn target() -> Target {
99
pointer_width: 64,
1010
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1111
arch: "aarch64".to_string(),
12-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1312
options: base,
1413
}
1514
}

‎compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkerFlavor, Target, TargetOptions};
1+
use crate::spec::{Target, TargetOptions};
22

33
pub fn target() -> Target {
44
let mut base = super::linux_base::opts();
@@ -9,7 +9,6 @@ pub fn target() -> Target {
99
pointer_width: 64,
1010
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1111
arch: "aarch64".to_string(),
12-
linker_flavor: LinkerFlavor::Gcc,
1312
options: TargetOptions {
1413
unsupported_abis: super::arm_base::unsupported_abis(),
1514
target_mcount: "\u{1}_mcount".to_string(),

0 commit comments

Comments
 (0)