Skip to content

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

-1
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

+1-2
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

+1-2
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

+1-2
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

+1-2
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

+1-2
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

+1-2
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

+1-2
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

+1-2
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

+1-2
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(),

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

+1-2
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_musl_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(),

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

+1-2
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::netbsd_base::opts();
@@ -10,7 +10,6 @@ pub fn target() -> Target {
1010
pointer_width: 64,
1111
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1212
arch: "aarch64".to_string(),
13-
linker_flavor: LinkerFlavor::Gcc,
1413
options: TargetOptions { target_mcount: "__mcount".to_string(), ..base },
1514
}
1615
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use super::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel, Target, TargetOp
1111
pub fn target() -> Target {
1212
let opts = TargetOptions {
1313
target_vendor: String::new(),
14+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1415
linker: Some("rust-lld".to_owned()),
1516
features: "+strict-align,+neon,+fp-armv8".to_string(),
1617
executables: true,
@@ -27,7 +28,6 @@ pub fn target() -> Target {
2728
pointer_width: 64,
2829
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2930
arch: "aarch64".to_string(),
30-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
3131
options: opts,
3232
}
3333
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use super::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel, Target, TargetOp
1111
pub fn target() -> Target {
1212
let opts = TargetOptions {
1313
target_vendor: String::new(),
14+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1415
linker: Some("rust-lld".to_owned()),
1516
features: "+strict-align,-neon,-fp-armv8".to_string(),
1617
executables: true,
@@ -27,7 +28,6 @@ pub fn target() -> Target {
2728
pointer_width: 64,
2829
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2930
arch: "aarch64".to_string(),
30-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
3131
options: opts,
3232
}
3333
}

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

+1-2
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::openbsd_base::opts();
@@ -10,7 +10,6 @@ pub fn target() -> Target {
1010
pointer_width: 64,
1111
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1212
arch: "aarch64".to_string(),
13-
linker_flavor: LinkerFlavor::Gcc,
1413
options: base,
1514
}
1615
}

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

+1-2
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::redox_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: base,
1413
}
1514
}

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

+1-2
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_uwp_msvc_base::opts();
@@ -10,7 +10,6 @@ pub fn target() -> Target {
1010
pointer_width: 64,
1111
data_layout: "e-m:w-p:64:64-i32:32-i64:64-i128:128-n32:64-S128".to_string(),
1212
arch: "aarch64".to_string(),
13-
linker_flavor: LinkerFlavor::Msvc,
1413
options: base,
1514
}
1615
}

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

+1-2
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::vxworks_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/arm_linux_androideabi.rs

+1-2
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::android_base::opts();
@@ -11,7 +11,6 @@ pub fn target() -> Target {
1111
pointer_width: 32,
1212
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1313
arch: "arm".to_string(),
14-
linker_flavor: LinkerFlavor::Gcc,
1514
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
1615
}
1716
}

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

+1-2
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();
@@ -8,7 +8,6 @@ pub fn target() -> Target {
88
pointer_width: 32,
99
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1010
arch: "arm".to_string(),
11-
linker_flavor: LinkerFlavor::Gcc,
1211

1312
options: TargetOptions {
1413
features: "+strict-align,+v6".to_string(),

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

+1-2
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();
@@ -8,7 +8,6 @@ pub fn target() -> Target {
88
pointer_width: 32,
99
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1010
arch: "arm".to_string(),
11-
linker_flavor: LinkerFlavor::Gcc,
1211

1312
options: TargetOptions {
1413
features: "+strict-align,+v6,+vfp2,-d32".to_string(),

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

+1-2
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_musl_base::opts();
@@ -15,7 +15,6 @@ pub fn target() -> Target {
1515
pointer_width: 32,
1616
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1717
arch: "arm".to_string(),
18-
linker_flavor: LinkerFlavor::Gcc,
1918
options: TargetOptions {
2019
unsupported_abis: super::arm_base::unsupported_abis(),
2120
target_mcount: "\u{1}mcount".to_string(),

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

+1-2
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_musl_base::opts();
@@ -15,7 +15,6 @@ pub fn target() -> Target {
1515
pointer_width: 32,
1616
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1717
arch: "arm".to_string(),
18-
linker_flavor: LinkerFlavor::Gcc,
1918
options: TargetOptions {
2019
unsupported_abis: super::arm_base::unsupported_abis(),
2120
target_mcount: "\u{1}mcount".to_string(),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ pub fn target() -> Target {
99
pointer_width: 32,
1010
data_layout: "E-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1111
arch: "arm".to_string(),
12-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1312

1413
options: TargetOptions {
1514
target_endian: "big".to_string(),
1615
target_vendor: String::new(),
16+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1717
executables: true,
1818
linker: Some("rust-lld".to_owned()),
1919
relocation_model: RelocModel::Static,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ pub fn target() -> Target {
99
pointer_width: 32,
1010
data_layout: "E-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1111
arch: "arm".to_string(),
12-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1312

1413
options: TargetOptions {
1514
target_endian: "big".to_string(),
1615
target_vendor: String::new(),
16+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1717
executables: true,
1818
linker: Some("rust-lld".to_owned()),
1919
relocation_model: RelocModel::Static,

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

+1-2
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 base = super::linux_base::opts();
@@ -7,7 +7,6 @@ pub fn target() -> Target {
77
pointer_width: 32,
88
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
99
arch: "arm".to_string(),
10-
linker_flavor: LinkerFlavor::Gcc,
1110

1211
options: TargetOptions {
1312
features: "+soft-float,+strict-align".to_string(),

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

+1-2
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 base = super::linux_base::opts();
@@ -7,7 +7,6 @@ pub fn target() -> Target {
77
pointer_width: 32,
88
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
99
arch: "arm".to_string(),
10-
linker_flavor: LinkerFlavor::Gcc,
1110

1211
options: TargetOptions {
1312
features: "+soft-float,+strict-align".to_string(),

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

+1-2
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 base = super::linux_musl_base::opts();
@@ -10,7 +10,6 @@ pub fn target() -> Target {
1010
pointer_width: 32,
1111
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1212
arch: "arm".to_string(),
13-
linker_flavor: LinkerFlavor::Gcc,
1413

1514
options: TargetOptions {
1615
features: "+soft-float,+strict-align".to_string(),

0 commit comments

Comments
 (0)