Skip to content

Commit b294cc7

Browse files
petrochenkovpetrochenkov
committed
rustc_target: Move target_vendor from Target to TargetOptions 
1 parent d5fd311 commit b294cc7

File tree

161 files changed

+28
-163
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

+28
-163
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_vendor: "apple".to_string(),
2322
linker_flavor: LinkerFlavor::Gcc,
2423
options: TargetOptions { target_mcount: "\u{1}mcount".to_string(), ..base },
2524
}

‎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_vendor: "apple".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312
options: TargetOptions {
1413
features: "+neon,+fp-armv8,+apple-a7".to_string(),

‎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_vendor: "apple".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312
options: TargetOptions {
1413
features: "+neon,+fp-armv8,+apple-a7".to_string(),

‎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_vendor: String::new(),
1312
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1413
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
1514
}

‎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_vendor: "unknown".to_string(),
1817
linker_flavor: LinkerFlavor::Gcc,
1918
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
2019
}

‎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_vendor: "pc".to_string(),
1514
linker_flavor: LinkerFlavor::Msvc,
1615
options: base,
1716
}

‎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_vendor: "unknown".to_string(),
1514
linker_flavor: LinkerFlavor::Gcc,
1615
options: base,
1716
}

‎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_vendor: "unknown".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
1514
}

‎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_vendor: "unknown".to_string(),
1312
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1413
options: base,
1514
}

‎compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu.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_vendor: "unknown".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413
options: TargetOptions {
1514
unsupported_abis: super::arm_base::unsupported_abis(),

‎compiler/rustc_target/src/spec/aarch64_unknown_linux_musl.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_vendor: "unknown".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413
options: TargetOptions {
1514
unsupported_abis: super::arm_base::unsupported_abis(),

‎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_vendor: "unknown".to_string(),
1413
linker_flavor: LinkerFlavor::Gcc,
1514
options: TargetOptions { target_mcount: "__mcount".to_string(), ..base },
1615
}

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

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

1111
pub fn target() -> Target {
1212
let opts = TargetOptions {
13+
target_vendor: String::new(),
1314
linker: Some("rust-lld".to_owned()),
1415
features: "+strict-align,+neon,+fp-armv8".to_string(),
1516
executables: true,
@@ -24,7 +25,6 @@ pub fn target() -> Target {
2425
Target {
2526
llvm_target: "aarch64-unknown-none".to_string(),
2627
pointer_width: 64,
27-
target_vendor: String::new(),
2828
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2929
arch: "aarch64".to_string(),
3030
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),

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

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

1111
pub fn target() -> Target {
1212
let opts = TargetOptions {
13+
target_vendor: String::new(),
1314
linker: Some("rust-lld".to_owned()),
1415
features: "+strict-align,-neon,-fp-armv8".to_string(),
1516
executables: true,
@@ -24,7 +25,6 @@ pub fn target() -> Target {
2425
Target {
2526
llvm_target: "aarch64-unknown-none".to_string(),
2627
pointer_width: 64,
27-
target_vendor: String::new(),
2828
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2929
arch: "aarch64".to_string(),
3030
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),

‎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_vendor: "unknown".to_string(),
1413
linker_flavor: LinkerFlavor::Gcc,
1514
options: base,
1615
}

‎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_vendor: "unknown".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413
options: base,
1514
}

‎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_vendor: "uwp".to_string(),
1413
linker_flavor: LinkerFlavor::Msvc,
1514
options: base,
1615
}

‎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_vendor: "wrs".to_string(),
1312
linker_flavor: LinkerFlavor::Gcc,
1413
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
1514
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pub fn opts(os: &str) -> TargetOptions {
1818

1919
TargetOptions {
2020
target_os: os.to_string(),
21+
target_vendor: "apple".to_string(),
2122
// macOS has -dead_strip, which doesn't rely on function_sections
2223
function_sections: false,
2324
dynamic_linking: true,

‎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_vendor: "unknown".to_string(),
1514
linker_flavor: LinkerFlavor::Gcc,
1615
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
1716
}

‎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_vendor: "unknown".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312

1413
options: TargetOptions {

‎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_vendor: "unknown".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312

1413
options: TargetOptions {

‎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_vendor: "unknown".to_string(),
1918
linker_flavor: LinkerFlavor::Gcc,
2019
options: TargetOptions {
2120
unsupported_abis: super::arm_base::unsupported_abis(),

‎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_vendor: "unknown".to_string(),
1918
linker_flavor: LinkerFlavor::Gcc,
2019
options: TargetOptions {
2120
unsupported_abis: super::arm_base::unsupported_abis(),

‎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-
target_vendor: "".to_string(),
1312
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1413

1514
options: TargetOptions {
1615
target_endian: "big".to_string(),
16+
target_vendor: String::new(),
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-
target_vendor: String::new(),
1312
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1413

1514
options: TargetOptions {
1615
target_endian: "big".to_string(),
16+
target_vendor: String::new(),
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
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_vendor: "unknown".to_string(),
1110
linker_flavor: LinkerFlavor::Gcc,
1211

1312
options: TargetOptions {

‎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_vendor: "unknown".to_string(),
1110
linker_flavor: LinkerFlavor::Gcc,
1211

1312
options: TargetOptions {

‎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_vendor: "unknown".to_string(),
1413
linker_flavor: LinkerFlavor::Gcc,
1514

1615
options: TargetOptions {

‎compiler/rustc_target/src/spec/armv6_unknown_freebsd.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_vendor: "unknown".to_string(),
1110
linker_flavor: LinkerFlavor::Gcc,
1211

1312
options: TargetOptions {

‎compiler/rustc_target/src/spec/armv6_unknown_netbsd_eabihf.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_vendor: "unknown".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312

1413
options: TargetOptions {

‎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_vendor: "apple".to_string(),
1211
linker_flavor: LinkerFlavor::Gcc,
1312
options: TargetOptions {
1413
features: "+v7,+vfp3,+neon".to_string(),

‎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_vendor: "unknown".to_string(),
2322
linker_flavor: LinkerFlavor::Gcc,
2423
options: TargetOptions { unsupported_abis: super::arm_base::unsupported_abis(), ..base },
2524
}

‎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_vendor: "unknown".to_string(),
1716
linker_flavor: LinkerFlavor::Gcc,
1817
options: TargetOptions { target_mcount: "\u{1}mcount".to_string(), ..base },
1918
}

‎compiler/rustc_target/src/spec/armv7_unknown_freebsd.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_vendor: "unknown".to_string(),
1110
linker_flavor: LinkerFlavor::Gcc,
1211

1312
options: TargetOptions {

‎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_vendor: "unknown".to_string(),
1413
linker_flavor: LinkerFlavor::Gcc,
1514

1615
options: TargetOptions {

‎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_vendor: "unknown".to_string(),
1413
linker_flavor: LinkerFlavor::Gcc,
1514

1615
options: TargetOptions {

‎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_vendor: "unknown".to_string(),
1918
linker_flavor: LinkerFlavor::Gcc,
2019

2120
options: TargetOptions {

‎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_vendor: "unknown".to_string(),
1615
linker_flavor: LinkerFlavor::Gcc,
1716

1817
// Most of these settings are copied from the armv7_unknown_linux_gnueabihf

‎compiler/rustc_target/src/spec/armv7_unknown_netbsd_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_vendor: "unknown".to_string(),
1110
linker_flavor: LinkerFlavor::Gcc,
1211

1312
options: TargetOptions {

‎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_vendor: "wrs".to_string(),
1110
linker_flavor: LinkerFlavor::Gcc,
1211
options: TargetOptions {
1312
// Info about features at https://wiki.debian.org/ArmHardFloatPort

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use super::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel, Target, TargetOp
2121

2222
pub fn target() -> Target {
2323
let opts = TargetOptions {
24+
target_vendor: String::new(),
2425
linker: Some("rust-lld".to_owned()),
2526
features: "+v7,+thumb2,+soft-float,-neon,+strict-align".to_string(),
2627
executables: true,
@@ -35,7 +36,6 @@ pub fn target() -> Target {
3536
Target {
3637
llvm_target: "armv7a-none-eabi".to_string(),
3738
pointer_width: 32,
38-
target_vendor: String::new(),
3939
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
4040
arch: "arm".to_string(),
4141
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use super::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel, Target, TargetOp
99

1010
pub fn target() -> Target {
1111
let opts = TargetOptions {
12+
target_vendor: String::new(),
1213
linker: Some("rust-lld".to_owned()),
1314
features: "+v7,+vfp3,-d32,+thumb2,-neon,+strict-align".to_string(),
1415
executables: true,
@@ -23,7 +24,6 @@ pub fn target() -> Target {
2324
Target {
2425
llvm_target: "armv7a-none-eabihf".to_string(),
2526
pointer_width: 32,
26-
target_vendor: String::new(),
2727
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
2828
arch: "arm".to_string(),
2929
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),

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

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

1514
options: TargetOptions {
15+
target_vendor: String::new(),
1616
executables: true,
1717
linker: Some("rust-lld".to_owned()),
1818
relocation_model: RelocModel::Static,

0 commit comments

Comments
 (0)