Skip to content

Commit f2ea2f6

Browse files
borsbors
committed
Auto merge of rust-lang#77729 - petrochenkov:mergetarg, r=Mark-Simulacrum
rustc_target: Move some target options from `Target` to `TargetOptions` The only reason for `Target` to `TargetOptions` to be separate structures is that options in `TargetOptions` have reasonable defaults and options in `Target` don't. (Otherwise all the options logically belong to a single `Target` struct.) This PR moves a number of options with reasonable defaults from `Target` to `TargetOptions`, so they no longer needs to be specified explicitly for majority of the targets. The move also allows to inherit the options from `rustc_target/src/spec/*_base.rs` files in a nicer way. I didn't change any specific option values here. The moved options are `target_c_int_width` (defaults to `"32"`), `target_endian` (defaults to `"little"`), `target_os` (defaults to `"none"`), `target_env` (defaults to `""`), `target_vendor` (defaults to `"unknown"`) and `linker_flavor` (defaults to `LinkerFlavor::Gcc`). Next steps (in later PRs): - Find a way to merge `TargetOptions` into `Target` - If not, always access `TargetOptions` fields through `Deref` making it a part of `Target` at least logically (`session.target.target.options.foo` -> `session.target.target.foo`) - ~Eliminate `session::config::Config` and use `Target` instead (`session.target.target.foo` -> `session.target.foo`)~ Done in rust-lang#77943. - Avoid tautologies in option names (`target.target_os` -> `target.os`) - Resolve _ rust-lang#77730 (rustc_target: The differences between `target_os = "none"` and `target_os = "unknown"`, and `target_vendor = "unknown"` and `target_vendor = ""` are unclear) noticed during implementation of this PR.
2 parents 771cc7f + c0c0597 commit f2ea2f6

File tree

181 files changed

+322
-1061
lines changed

Some content is hidden

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

181 files changed

+322
-1061
lines changed

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::spec::{LinkerFlavor, Target, TargetOptions};
22

33
pub fn target() -> Target {
4-
let mut base = super::apple_base::opts();
4+
let mut base = super::apple_base::opts("macos");
55
base.cpu = "apple-a12".to_string();
66
base.max_atomic_width = Some(128);
77
base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-arch".to_string(), "arm64".to_string()]);
@@ -16,15 +16,9 @@ pub fn target() -> Target {
1616

1717
Target {
1818
llvm_target,
19-
target_endian: "little".to_string(),
2019
pointer_width: 64,
21-
target_c_int_width: "32".to_string(),
2220
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".to_string(),
2321
arch: arch.to_string(),
24-
target_os: "macos".to_string(),
25-
target_env: String::new(),
26-
target_vendor: "apple".to_string(),
27-
linker_flavor: LinkerFlavor::Gcc,
2822
options: TargetOptions { target_mcount: "\u{1}mcount".to_string(), ..base },
2923
}
3024
}

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
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 {
5-
let base = opts(Arch::Arm64);
5+
let base = opts("ios", Arch::Arm64);
66
Target {
77
llvm_target: "arm64-apple-ios".to_string(),
8-
target_endian: "little".to_string(),
98
pointer_width: 64,
10-
target_c_int_width: "32".to_string(),
119
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".to_string(),
1210
arch: "aarch64".to_string(),
13-
target_os: "ios".to_string(),
14-
target_env: String::new(),
15-
target_vendor: "apple".to_string(),
16-
linker_flavor: LinkerFlavor::Gcc,
1711
options: TargetOptions {
1812
features: "+neon,+fp-armv8,+apple-a7".to_string(),
1913
eliminate_frame_pointer: false,

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
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 {
5-
let base = opts(Arch::Arm64);
5+
let base = opts("tvos", Arch::Arm64);
66
Target {
77
llvm_target: "arm64-apple-tvos".to_string(),
8-
target_endian: "little".to_string(),
98
pointer_width: 64,
10-
target_c_int_width: "32".to_string(),
119
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".to_string(),
1210
arch: "aarch64".to_string(),
13-
target_os: "tvos".to_string(),
14-
target_env: String::new(),
15-
target_vendor: "apple".to_string(),
16-
linker_flavor: LinkerFlavor::Gcc,
1711
options: TargetOptions {
1812
features: "+neon,+fp-armv8,+apple-a7".to_string(),
1913
eliminate_frame_pointer: false,

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
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();
55
base.max_atomic_width = Some(128);
66

77
Target {
88
llvm_target: "aarch64-fuchsia".to_string(),
9-
target_endian: "little".to_string(),
109
pointer_width: 64,
11-
target_c_int_width: "32".to_string(),
1210
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1311
arch: "aarch64".to_string(),
14-
target_os: "fuchsia".to_string(),
15-
target_env: String::new(),
16-
target_vendor: String::new(),
17-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1812
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
1913
}
2014
}

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

+1-7
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.
@@ -11,15 +11,9 @@ pub fn target() -> Target {
1111
base.features = "+neon,+fp-armv8".to_string();
1212
Target {
1313
llvm_target: "aarch64-linux-android".to_string(),
14-
target_endian: "little".to_string(),
1514
pointer_width: 64,
16-
target_c_int_width: "32".to_string(),
1715
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1816
arch: "aarch64".to_string(),
19-
target_os: "android".to_string(),
20-
target_env: String::new(),
21-
target_vendor: "unknown".to_string(),
22-
linker_flavor: LinkerFlavor::Gcc,
2317
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
2418
}
2519
}

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

+1-7
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();
@@ -8,15 +8,9 @@ pub fn target() -> Target {
88

99
Target {
1010
llvm_target: "aarch64-pc-windows-msvc".to_string(),
11-
target_endian: "little".to_string(),
1211
pointer_width: 64,
13-
target_c_int_width: "32".to_string(),
1412
data_layout: "e-m:w-p:64:64-i32:32-i64:64-i128:128-n32:64-S128".to_string(),
1513
arch: "aarch64".to_string(),
16-
target_os: "windows".to_string(),
17-
target_env: "msvc".to_string(),
18-
target_vendor: "pc".to_string(),
19-
linker_flavor: LinkerFlavor::Msvc,
2014
options: base,
2115
}
2216
}

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

+1-7
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();
@@ -8,15 +8,9 @@ pub fn target() -> Target {
88

99
Target {
1010
llvm_target: "aarch64-unknown-cloudabi".to_string(),
11-
target_endian: "little".to_string(),
1211
pointer_width: 64,
13-
target_c_int_width: "32".to_string(),
1412
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1513
arch: "aarch64".to_string(),
16-
target_os: "cloudabi".to_string(),
17-
target_env: String::new(),
18-
target_vendor: "unknown".to_string(),
19-
linker_flavor: LinkerFlavor::Gcc,
2014
options: base,
2115
}
2216
}

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
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();
55
base.max_atomic_width = Some(128);
66

77
Target {
88
llvm_target: "aarch64-unknown-freebsd".to_string(),
9-
target_endian: "little".to_string(),
109
pointer_width: 64,
11-
target_c_int_width: "32".to_string(),
1210
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1311
arch: "aarch64".to_string(),
14-
target_os: "freebsd".to_string(),
15-
target_env: String::new(),
16-
target_vendor: "unknown".to_string(),
17-
linker_flavor: LinkerFlavor::Gcc,
1812
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
1913
}
2014
}

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
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();
55
base.max_atomic_width = Some(128);
66

77
Target {
88
llvm_target: "aarch64-unknown-hermit".to_string(),
9-
target_endian: "little".to_string(),
109
pointer_width: 64,
11-
target_c_int_width: "32".to_string(),
1210
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1311
arch: "aarch64".to_string(),
14-
target_os: "hermit".to_string(),
15-
target_env: String::new(),
16-
target_vendor: "unknown".to_string(),
17-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1812
options: base,
1913
}
2014
}

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
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();
55
base.max_atomic_width = Some(128);
66

77
Target {
88
llvm_target: "aarch64-unknown-linux-gnu".to_string(),
9-
target_endian: "little".to_string(),
109
pointer_width: 64,
11-
target_c_int_width: "32".to_string(),
12-
target_env: "gnu".to_string(),
1310
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1411
arch: "aarch64".to_string(),
15-
target_os: "linux".to_string(),
16-
target_vendor: "unknown".to_string(),
17-
linker_flavor: LinkerFlavor::Gcc,
1812
options: TargetOptions {
1913
unsupported_abis: super::arm_base::unsupported_abis(),
2014
target_mcount: "\u{1}_mcount".to_string(),

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
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();
55
base.max_atomic_width = Some(128);
66

77
Target {
88
llvm_target: "aarch64-unknown-linux-musl".to_string(),
9-
target_endian: "little".to_string(),
109
pointer_width: 64,
11-
target_c_int_width: "32".to_string(),
12-
target_env: "musl".to_string(),
1310
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1411
arch: "aarch64".to_string(),
15-
target_os: "linux".to_string(),
16-
target_vendor: "unknown".to_string(),
17-
linker_flavor: LinkerFlavor::Gcc,
1812
options: TargetOptions {
1913
unsupported_abis: super::arm_base::unsupported_abis(),
2014
target_mcount: "\u{1}_mcount".to_string(),

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

+1-7
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();
@@ -7,15 +7,9 @@ pub fn target() -> Target {
77

88
Target {
99
llvm_target: "aarch64-unknown-netbsd".to_string(),
10-
target_endian: "little".to_string(),
1110
pointer_width: 64,
12-
target_c_int_width: "32".to_string(),
1311
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1412
arch: "aarch64".to_string(),
15-
target_os: "netbsd".to_string(),
16-
target_env: String::new(),
17-
target_vendor: "unknown".to_string(),
18-
linker_flavor: LinkerFlavor::Gcc,
1913
options: TargetOptions { target_mcount: "__mcount".to_string(), ..base },
2014
}
2115
}

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ use super::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel, Target, TargetOp
1010

1111
pub fn target() -> Target {
1212
let opts = TargetOptions {
13+
target_vendor: String::new(),
14+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1315
linker: Some("rust-lld".to_owned()),
1416
features: "+strict-align,+neon,+fp-armv8".to_string(),
1517
executables: true,
@@ -23,15 +25,9 @@ pub fn target() -> Target {
2325
};
2426
Target {
2527
llvm_target: "aarch64-unknown-none".to_string(),
26-
target_endian: "little".to_string(),
2728
pointer_width: 64,
28-
target_c_int_width: "32".to_string(),
29-
target_os: "none".to_string(),
30-
target_env: String::new(),
31-
target_vendor: String::new(),
3229
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
3330
arch: "aarch64".to_string(),
34-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
3531
options: opts,
3632
}
3733
}

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ use super::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel, Target, TargetOp
1010

1111
pub fn target() -> Target {
1212
let opts = TargetOptions {
13+
target_vendor: String::new(),
14+
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1315
linker: Some("rust-lld".to_owned()),
1416
features: "+strict-align,-neon,-fp-armv8".to_string(),
1517
executables: true,
@@ -23,15 +25,9 @@ pub fn target() -> Target {
2325
};
2426
Target {
2527
llvm_target: "aarch64-unknown-none".to_string(),
26-
target_endian: "little".to_string(),
2728
pointer_width: 64,
28-
target_c_int_width: "32".to_string(),
29-
target_os: "none".to_string(),
30-
target_env: String::new(),
31-
target_vendor: String::new(),
3229
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
3330
arch: "aarch64".to_string(),
34-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
3531
options: opts,
3632
}
3733
}

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

+1-7
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();
@@ -7,15 +7,9 @@ pub fn target() -> Target {
77

88
Target {
99
llvm_target: "aarch64-unknown-openbsd".to_string(),
10-
target_endian: "little".to_string(),
1110
pointer_width: 64,
12-
target_c_int_width: "32".to_string(),
1311
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1412
arch: "aarch64".to_string(),
15-
target_os: "openbsd".to_string(),
16-
target_env: String::new(),
17-
target_vendor: "unknown".to_string(),
18-
linker_flavor: LinkerFlavor::Gcc,
1913
options: base,
2014
}
2115
}

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
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();
55
base.max_atomic_width = Some(128);
66

77
Target {
88
llvm_target: "aarch64-unknown-redox".to_string(),
9-
target_endian: "little".to_string(),
109
pointer_width: 64,
11-
target_c_int_width: "32".to_string(),
1210
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1311
arch: "aarch64".to_string(),
14-
target_os: "redox".to_string(),
15-
target_env: "relibc".to_string(),
16-
target_vendor: "unknown".to_string(),
17-
linker_flavor: LinkerFlavor::Gcc,
1812
options: base,
1913
}
2014
}

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

+1-7
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();
@@ -7,15 +7,9 @@ pub fn target() -> Target {
77

88
Target {
99
llvm_target: "aarch64-pc-windows-msvc".to_string(),
10-
target_endian: "little".to_string(),
1110
pointer_width: 64,
12-
target_c_int_width: "32".to_string(),
1311
data_layout: "e-m:w-p:64:64-i32:32-i64:64-i128:128-n32:64-S128".to_string(),
1412
arch: "aarch64".to_string(),
15-
target_os: "windows".to_string(),
16-
target_env: "msvc".to_string(),
17-
target_vendor: "uwp".to_string(),
18-
linker_flavor: LinkerFlavor::Msvc,
1913
options: base,
2014
}
2115
}

0 commit comments

Comments
 (0)