Skip to content

Commit d5fd311

Browse files
committed
rustc_target: Move target_env from Target to TargetOptions
1 parent 74ffb9b commit d5fd311

File tree

161 files changed

+27
-158
lines changed

Some content is hidden

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

161 files changed

+27
-158
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-
target_env: String::new(),
2322
target_vendor: "apple".to_string(),
2423
linker_flavor: LinkerFlavor::Gcc,
2524
options: TargetOptions { target_mcount: "\u{1}mcount".to_string(), ..base },

compiler/rustc_target/src/spec/aarch64_apple_ios.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: String::new(),
1211
target_vendor: "apple".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413
options: TargetOptions {

compiler/rustc_target/src/spec/aarch64_apple_tvos.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: String::new(),
1211
target_vendor: "apple".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413
options: TargetOptions {

compiler/rustc_target/src/spec/aarch64_fuchsia.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: String::new(),
1312
target_vendor: String::new(),
1413
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1514
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },

compiler/rustc_target/src/spec/aarch64_linux_android.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: String::new(),
1817
target_vendor: "unknown".to_string(),
1918
linker_flavor: LinkerFlavor::Gcc,
2019
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },

compiler/rustc_target/src/spec/aarch64_pc_windows_msvc.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "msvc".to_string(),
1514
target_vendor: "pc".to_string(),
1615
linker_flavor: LinkerFlavor::Msvc,
1716
options: base,

compiler/rustc_target/src/spec/aarch64_unknown_cloudabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: String::new(),
1514
target_vendor: "unknown".to_string(),
1615
linker_flavor: LinkerFlavor::Gcc,
1716
options: base,

compiler/rustc_target/src/spec/aarch64_unknown_freebsd.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: String::new(),
1312
target_vendor: "unknown".to_string(),
1413
linker_flavor: LinkerFlavor::Gcc,
1514
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },

compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: String::new(),
1312
target_vendor: "unknown".to_string(),
1413
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1514
options: base,

compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pub fn target() -> Target {
77
Target {
88
llvm_target: "aarch64-unknown-linux-gnu".to_string(),
99
pointer_width: 64,
10-
target_env: "gnu".to_string(),
1110
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1211
arch: "aarch64".to_string(),
1312
target_vendor: "unknown".to_string(),

compiler/rustc_target/src/spec/aarch64_unknown_linux_musl.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pub fn target() -> Target {
77
Target {
88
llvm_target: "aarch64-unknown-linux-musl".to_string(),
99
pointer_width: 64,
10-
target_env: "musl".to_string(),
1110
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1211
arch: "aarch64".to_string(),
1312
target_vendor: "unknown".to_string(),

compiler/rustc_target/src/spec/aarch64_unknown_netbsd.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: String::new(),
1413
target_vendor: "unknown".to_string(),
1514
linker_flavor: LinkerFlavor::Gcc,
1615
options: TargetOptions { target_mcount: "__mcount".to_string(), ..base },

compiler/rustc_target/src/spec/aarch64_unknown_none.rs

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ pub fn target() -> Target {
2424
Target {
2525
llvm_target: "aarch64-unknown-none".to_string(),
2626
pointer_width: 64,
27-
target_env: String::new(),
2827
target_vendor: String::new(),
2928
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
3029
arch: "aarch64".to_string(),

compiler/rustc_target/src/spec/aarch64_unknown_none_softfloat.rs

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ pub fn target() -> Target {
2424
Target {
2525
llvm_target: "aarch64-unknown-none".to_string(),
2626
pointer_width: 64,
27-
target_env: String::new(),
2827
target_vendor: String::new(),
2928
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
3029
arch: "aarch64".to_string(),

compiler/rustc_target/src/spec/aarch64_unknown_openbsd.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: String::new(),
1413
target_vendor: "unknown".to_string(),
1514
linker_flavor: LinkerFlavor::Gcc,
1615
options: base,

compiler/rustc_target/src/spec/aarch64_unknown_redox.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "relibc".to_string(),
1312
target_vendor: "unknown".to_string(),
1413
linker_flavor: LinkerFlavor::Gcc,
1514
options: base,

compiler/rustc_target/src/spec/aarch64_uwp_windows_msvc.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "msvc".to_string(),
1413
target_vendor: "uwp".to_string(),
1514
linker_flavor: LinkerFlavor::Msvc,
1615
options: base,

compiler/rustc_target/src/spec/aarch64_wrs_vxworks.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "gnu".to_string(),
1312
target_vendor: "wrs".to_string(),
1413
linker_flavor: LinkerFlavor::Gcc,
1514
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },

compiler/rustc_target/src/spec/arm_linux_androideabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: String::new(),
1514
target_vendor: "unknown".to_string(),
1615
linker_flavor: LinkerFlavor::Gcc,
1716
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },

compiler/rustc_target/src/spec/arm_unknown_linux_gnueabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "gnu".to_string(),
1211
target_vendor: "unknown".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413

compiler/rustc_target/src/spec/arm_unknown_linux_gnueabihf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "gnu".to_string(),
1211
target_vendor: "unknown".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413

compiler/rustc_target/src/spec/arm_unknown_linux_musleabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "musl".to_string(),
1918
target_vendor: "unknown".to_string(),
2019
linker_flavor: LinkerFlavor::Gcc,
2120
options: TargetOptions {

compiler/rustc_target/src/spec/arm_unknown_linux_musleabihf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "musl".to_string(),
1918
target_vendor: "unknown".to_string(),
2019
linker_flavor: LinkerFlavor::Gcc,
2120
options: TargetOptions {

compiler/rustc_target/src/spec/armebv7r_none_eabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ 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-
target_env: "".to_string(),
1312
target_vendor: "".to_string(),
1413
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1514

compiler/rustc_target/src/spec/armebv7r_none_eabihf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ 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-
target_env: String::new(),
1312
target_vendor: String::new(),
1413
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1514

compiler/rustc_target/src/spec/armv4t_unknown_linux_gnueabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "gnu".to_string(),
1110
target_vendor: "unknown".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312

compiler/rustc_target/src/spec/armv5te_unknown_linux_gnueabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "gnu".to_string(),
1110
target_vendor: "unknown".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312

compiler/rustc_target/src/spec/armv5te_unknown_linux_musleabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "musl".to_string(),
1413
target_vendor: "unknown".to_string(),
1514
linker_flavor: LinkerFlavor::Gcc,
1615

compiler/rustc_target/src/spec/armv6_unknown_freebsd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ 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-
target_env: "gnueabihf".to_string(),
1110
target_vendor: "unknown".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312

1413
options: TargetOptions {
14+
target_env: "gnueabihf".to_string(),
1515
features: "+v6,+vfp2,-d32".to_string(),
1616
max_atomic_width: Some(64),
1717
unsupported_abis: super::arm_base::unsupported_abis(),

compiler/rustc_target/src/spec/armv6_unknown_netbsd_eabihf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ 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-
target_env: "eabihf".to_string(),
1211
target_vendor: "unknown".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413

1514
options: TargetOptions {
15+
target_env: "eabihf".to_string(),
1616
features: "+v6,+vfp2,-d32".to_string(),
1717
unsupported_abis: super::arm_base::unsupported_abis(),
1818
target_mcount: "__mcount".to_string(),

compiler/rustc_target/src/spec/armv7_apple_ios.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ pub fn target() -> Target {
88
pointer_width: 32,
99
data_layout: "e-m:o-p:32:32-Fi8-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32".to_string(),
1010
arch: "arm".to_string(),
11-
target_env: String::new(),
1211
target_vendor: "apple".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413
options: TargetOptions {

compiler/rustc_target/src/spec/armv7_linux_androideabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ pub fn target() -> Target {
1919
pointer_width: 32,
2020
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
2121
arch: "arm".to_string(),
22-
target_env: String::new(),
2322
target_vendor: "unknown".to_string(),
2423
linker_flavor: LinkerFlavor::Gcc,
2524
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },

compiler/rustc_target/src/spec/armv7_unknown_cloudabi_eabihf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ pub fn target() -> Target {
1313
pointer_width: 32,
1414
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1515
arch: "arm".to_string(),
16-
target_env: String::new(),
1716
target_vendor: "unknown".to_string(),
1817
linker_flavor: LinkerFlavor::Gcc,
1918
options: TargetOptions { target_mcount: "\u{1}mcount".to_string(), ..base },

compiler/rustc_target/src/spec/armv7_unknown_freebsd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ 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-
target_env: "gnueabihf".to_string(),
1110
target_vendor: "unknown".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312

1413
options: TargetOptions {
14+
target_env: "gnueabihf".to_string(),
1515
features: "+v7,+vfp3,-d32,+thumb2,-neon".to_string(),
1616
max_atomic_width: Some(64),
1717
unsupported_abis: super::arm_base::unsupported_abis(),

compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "gnu".to_string(),
1413
target_vendor: "unknown".to_string(),
1514
linker_flavor: LinkerFlavor::Gcc,
1615

compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabihf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "gnu".to_string(),
1413
target_vendor: "unknown".to_string(),
1514
linker_flavor: LinkerFlavor::Gcc,
1615

compiler/rustc_target/src/spec/armv7_unknown_linux_musleabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "musl".to_string(),
1918
target_vendor: "unknown".to_string(),
2019
linker_flavor: LinkerFlavor::Gcc,
2120

compiler/rustc_target/src/spec/armv7_unknown_linux_musleabihf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ pub fn target() -> Target {
1212
pointer_width: 32,
1313
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1414
arch: "arm".to_string(),
15-
target_env: "musl".to_string(),
1615
target_vendor: "unknown".to_string(),
1716
linker_flavor: LinkerFlavor::Gcc,
1817

compiler/rustc_target/src/spec/armv7_unknown_netbsd_eabihf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ 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-
target_env: "eabihf".to_string(),
1110
target_vendor: "unknown".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312

1413
options: TargetOptions {
14+
target_env: "eabihf".to_string(),
1515
features: "+v7,+vfp3,-d32,+thumb2,-neon".to_string(),
1616
cpu: "generic".to_string(),
1717
max_atomic_width: Some(64),

compiler/rustc_target/src/spec/armv7_wrs_vxworks_eabihf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -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-
target_env: "gnu".to_string(),
1110
target_vendor: "wrs".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312
options: TargetOptions {

compiler/rustc_target/src/spec/armv7a_none_eabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ pub fn target() -> Target {
3535
Target {
3636
llvm_target: "armv7a-none-eabi".to_string(),
3737
pointer_width: 32,
38-
target_env: String::new(),
3938
target_vendor: String::new(),
4039
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
4140
arch: "arm".to_string(),

compiler/rustc_target/src/spec/armv7a_none_eabihf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ pub fn target() -> Target {
2323
Target {
2424
llvm_target: "armv7a-none-eabihf".to_string(),
2525
pointer_width: 32,
26-
target_env: String::new(),
2726
target_vendor: String::new(),
2827
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
2928
arch: "arm".to_string(),

compiler/rustc_target/src/spec/armv7r_none_eabi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ 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-
target_env: "".to_string(),
1312
target_vendor: "".to_string(),
1413
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1514

compiler/rustc_target/src/spec/armv7r_none_eabihf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ 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-
target_env: "".to_string(),
1312
target_vendor: "".to_string(),
1413
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1514

compiler/rustc_target/src/spec/armv7s_apple_ios.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ pub fn target() -> Target {
88
pointer_width: 32,
99
data_layout: "e-m:o-p:32:32-Fi8-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32".to_string(),
1010
arch: "arm".to_string(),
11-
target_env: String::new(),
1211
target_vendor: "apple".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413
options: TargetOptions {

compiler/rustc_target/src/spec/avr_gnu_base.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub fn target(target_cpu: String) -> Target {
1010
llvm_target: "avr-unknown-unknown".to_string(),
1111
pointer_width: 16,
1212
linker_flavor: LinkerFlavor::Gcc,
13-
target_env: "".to_string(),
1413
target_vendor: "unknown".to_string(),
1514
options: TargetOptions {
1615
target_c_int_width: "16".to_string(),

compiler/rustc_target/src/spec/hexagon_unknown_linux_musl.rs

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ pub fn target() -> Target {
2828
)
2929
.to_string(),
3030
arch: "hexagon".to_string(),
31-
target_env: "musl".to_string(),
3231
target_vendor: "unknown".to_string(),
3332
linker_flavor: LinkerFlavor::Gcc,
3433
options: base,

0 commit comments

Comments
 (0)