Skip to content

Commit d5eb31c

Browse files
borsbors
committed
Auto merge of rust-lang#136953 - ken-matsui:import-target-metadata, r=workingjubilee
rustc_target: import TargetMetadata
2 parents d1fb81e + b660382 commit d5eb31c

File tree

274 files changed

+679
-568
lines changed

Some content is hidden

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

274 files changed

+679
-568
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("macos", Arch::Arm64, TargetAbi::Normal);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple macOS (11.0+, Big Sur+)".into()),
1010
tier: Some(1),
1111
host_tools: Some(true),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("ios", Arch::Arm64, TargetAbi::Normal);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple iOS".into()),
1010
tier: Some(2),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("ios", Arch::Arm64, TargetAbi::MacCatalyst);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple Mac Catalyst".into()),
1010
tier: Some(2),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("ios", Arch::Arm64, TargetAbi::Simulator);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple iOS Simulator".into()),
1010
tier: Some(2),
1111
host_tools: Some(false),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, Target, TargetOptions};
2+
use crate::spec::{FramePointer, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("tvos", Arch::Arm64, TargetAbi::Normal);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple tvOS".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, Target, TargetOptions};
2+
use crate::spec::{FramePointer, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("tvos", Arch::Arm64, TargetAbi::Simulator);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple tvOS Simulator".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_visionos.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("visionos", Arch::Arm64, TargetAbi::Normal);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple visionOS".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_visionos_sim.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("visionos", Arch::Arm64, TargetAbi::Simulator);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple visionOS simulator".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_watchos.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{Target, TargetOptions};
2+
use crate::spec::{Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("watchos", Arch::Arm64, TargetAbi::Normal);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple watchOS".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_watchos_sim.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, Target, TargetOptions};
2+
use crate::spec::{FramePointer, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("watchos", Arch::Arm64, TargetAbi::Simulator);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple watchOS Simulator".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_be_unknown_linux_gnu.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use rustc_abi::Endian;
22

3-
use crate::spec::{StackProbeType, Target, TargetOptions, base};
3+
use crate::spec::{StackProbeType, Target, TargetMetadata, TargetOptions, base};
44

55
pub(crate) fn target() -> Target {
66
Target {
77
llvm_target: "aarch64_be-unknown-linux-gnu".into(),
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Linux (big-endian)".into()),
1010
tier: Some(3),
1111
host_tools: Some(true),

‎compiler/rustc_target/src/spec/targets/aarch64_be_unknown_linux_gnu_ilp32.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
use rustc_abi::Endian;
22

3-
use crate::spec::{StackProbeType, Target, TargetOptions, base};
3+
use crate::spec::{StackProbeType, Target, TargetMetadata, TargetOptions, base};
44

55
pub(crate) fn target() -> Target {
66
let mut base = base::linux_gnu::opts();
77
base.max_atomic_width = Some(128);
88

99
Target {
1010
llvm_target: "aarch64_be-unknown-linux-gnu_ilp32".into(),
11-
metadata: crate::spec::TargetMetadata {
11+
metadata: TargetMetadata {
1212
description: Some("ARM64 Linux (big-endian, ILP32 ABI)".into()),
1313
tier: Some(3),
1414
host_tools: Some(true),

‎compiler/rustc_target/src/spec/targets/aarch64_be_unknown_netbsd.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use rustc_abi::Endian;
22

3-
use crate::spec::{StackProbeType, Target, TargetOptions, base};
3+
use crate::spec::{StackProbeType, Target, TargetMetadata, TargetOptions, base};
44

55
pub(crate) fn target() -> Target {
66
Target {
77
llvm_target: "aarch64_be-unknown-netbsd".into(),
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 NetBSD (big-endian)".into()),
1010
tier: Some(3),
1111
host_tools: Some(true),

‎compiler/rustc_target/src/spec/targets/aarch64_kmc_solid_asp3.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use crate::spec::{RelocModel, StackProbeType, Target, TargetOptions, base};
1+
use crate::spec::{RelocModel, StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
let base = base::solid::opts("asp3");
55
Target {
66
llvm_target: "aarch64-unknown-none".into(),
7-
metadata: crate::spec::TargetMetadata {
7+
metadata: TargetMetadata {
88
description: Some("ARM64 SOLID with TOPPERS/ASP3".into()),
99
tier: Some(3),
1010
host_tools: Some(false),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetOptions, base};
1+
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
// See https://developer.android.com/ndk/guides/abis.html#arm64-v8a
44
// for target ABI requirements.
55

66
pub(crate) fn target() -> Target {
77
Target {
88
llvm_target: "aarch64-linux-android".into(),
9-
metadata: crate::spec::TargetMetadata {
9+
metadata: TargetMetadata {
1010
description: Some("ARM64 Android".into()),
1111
tier: Some(2),
1212
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_nintendo_switch_freestanding.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::spec::{
2-
Cc, LinkerFlavor, Lld, PanicStrategy, RelroLevel, StackProbeType, Target, TargetOptions,
2+
Cc, LinkerFlavor, Lld, PanicStrategy, RelroLevel, StackProbeType, Target, TargetMetadata,
3+
TargetOptions,
34
};
45

56
const LINKER_SCRIPT: &str = include_str!("./aarch64_nintendo_switch_freestanding_linker_script.ld");
@@ -8,7 +9,7 @@ const LINKER_SCRIPT: &str = include_str!("./aarch64_nintendo_switch_freestanding
89
pub(crate) fn target() -> Target {
910
Target {
1011
llvm_target: "aarch64-unknown-none".into(),
11-
metadata: crate::spec::TargetMetadata {
12+
metadata: TargetMetadata {
1213
description: Some("ARM64 Nintendo Switch, Horizon".into()),
1314
tier: Some(3),
1415
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_pc_windows_gnullvm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{Target, base};
1+
use crate::spec::{Target, TargetMetadata, base};
22

33
pub(crate) fn target() -> Target {
44
let mut base = base::windows_gnullvm::opts();
@@ -8,7 +8,7 @@ pub(crate) fn target() -> Target {
88

99
Target {
1010
llvm_target: "aarch64-pc-windows-gnu".into(),
11-
metadata: crate::spec::TargetMetadata {
11+
metadata: TargetMetadata {
1212
description: Some("ARM64 MinGW (Windows 10+), LLVM ABI".into()),
1313
tier: Some(2),
1414
host_tools: Some(false),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{Target, base};
1+
use crate::spec::{Target, TargetMetadata, base};
22

33
pub(crate) fn target() -> Target {
44
let mut base = base::windows_msvc::opts();
@@ -7,7 +7,7 @@ pub(crate) fn target() -> Target {
77

88
Target {
99
llvm_target: "aarch64-pc-windows-msvc".into(),
10-
metadata: crate::spec::TargetMetadata {
10+
metadata: TargetMetadata {
1111
description: Some("ARM64 Windows MSVC".into()),
1212
tier: Some(2),
1313
host_tools: Some(true),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetOptions, base};
1+
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
55
llvm_target: "aarch64-unknown-freebsd".into(),
6-
metadata: crate::spec::TargetMetadata {
6+
metadata: TargetMetadata {
77
description: Some("ARM64 FreeBSD".into()),
88
tier: Some(3),
99
host_tools: Some(true),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_fuchsia.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetOptions, base};
1+
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
55
llvm_target: "aarch64-unknown-fuchsia".into(),
6-
metadata: crate::spec::TargetMetadata {
6+
metadata: TargetMetadata {
77
description: Some("ARM64 Fuchsia".into()),
88
tier: Some(2),
99
host_tools: Some(false),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::spec::{StackProbeType, Target, TargetOptions, base};
1+
use crate::spec::{StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
55
llvm_target: "aarch64-unknown-hermit".into(),
6-
metadata: crate::spec::TargetMetadata {
6+
metadata: TargetMetadata {
77
description: Some("ARM64 Hermit".into()),
88
tier: Some(3),
99
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_illumos.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{Cc, LinkerFlavor, SanitizerSet, Target, base};
1+
use crate::spec::{Cc, LinkerFlavor, SanitizerSet, Target, TargetMetadata, base};
22

33
pub(crate) fn target() -> Target {
44
let mut base = base::illumos::opts();
@@ -11,7 +11,7 @@ pub(crate) fn target() -> Target {
1111
// LLVM does not currently have a separate illumos target,
1212
// so we still pass Solaris to it
1313
llvm_target: "aarch64-unknown-solaris2.11".into(),
14-
metadata: crate::spec::TargetMetadata {
14+
metadata: TargetMetadata {
1515
description: Some("ARM64 illumos".into()),
1616
tier: Some(3),
1717
host_tools: Some(true),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetOptions, base};
1+
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
55
llvm_target: "aarch64-unknown-linux-gnu".into(),
6-
metadata: crate::spec::TargetMetadata {
6+
metadata: TargetMetadata {
77
description: Some("ARM64 Linux (kernel 4.1, glibc 2.17+)".into()),
88
tier: Some(1),
99
host_tools: Some(true),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_gnu_ilp32.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::spec::{StackProbeType, Target, TargetOptions, base};
1+
use crate::spec::{StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
55
llvm_target: "aarch64-unknown-linux-gnu_ilp32".into(),
6-
metadata: crate::spec::TargetMetadata {
6+
metadata: TargetMetadata {
77
description: Some("ARM64 Linux (ILP32 ABI)".into()),
88
tier: Some(3),
99
host_tools: Some(true),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetOptions, base};
1+
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
let mut base = base::linux_musl::opts();
@@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
1717

1818
Target {
1919
llvm_target: "aarch64-unknown-linux-musl".into(),
20-
metadata: crate::spec::TargetMetadata {
20+
metadata: TargetMetadata {
2121
description: Some("ARM64 Linux with musl 1.2.3".into()),
2222
tier: Some(2),
2323
host_tools: Some(true),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_ohos.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetOptions, base};
1+
use crate::spec::{SanitizerSet, StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
let mut base = base::linux_ohos::opts();
55
base.max_atomic_width = Some(128);
66

77
Target {
88
llvm_target: "aarch64-unknown-linux-ohos".into(),
9-
metadata: crate::spec::TargetMetadata {
9+
metadata: TargetMetadata {
1010
description: Some("ARM64 OpenHarmony".into()),
1111
tier: Some(2),
1212
host_tools: Some(false),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::spec::{StackProbeType, Target, TargetOptions, base};
1+
use crate::spec::{StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
55
llvm_target: "aarch64-unknown-netbsd".into(),
6-
metadata: crate::spec::TargetMetadata {
6+
metadata: TargetMetadata {
77
description: Some("ARM64 NetBSD".into()),
88
tier: Some(3),
99
host_tools: Some(true),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
use crate::spec::{
1010
Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, SanitizerSet, StackProbeType, Target,
11-
TargetOptions,
11+
TargetMetadata, TargetOptions,
1212
};
1313

1414
pub(crate) fn target() -> Target {
@@ -31,7 +31,7 @@ pub(crate) fn target() -> Target {
3131
};
3232
Target {
3333
llvm_target: "aarch64-unknown-none".into(),
34-
metadata: crate::spec::TargetMetadata {
34+
metadata: TargetMetadata {
3535
description: Some("Bare ARM64, hardfloat".into()),
3636
tier: Some(2),
3737
host_tools: Some(false),

0 commit comments

Comments
 (0)