targets: move target specs to spec/targets

Signed-off-by: David Wood <[email protected]>

Author: davidtwco

Diff for: compiler/rustc_target/src/spec/aarch64_fuchsia.rs

@@ -1,4 +1,4 @@
-use crate::spec::{
+use crate::spec::targets::{
     aarch64_apple_darwin, aarch64_apple_ios_sim, aarch64_apple_watchos_sim, i686_apple_darwin,
     x86_64_apple_darwin, x86_64_apple_ios, x86_64_apple_tvos, x86_64_apple_watchos_sim,
 };

Diff for: compiler/rustc_target/src/spec/base/apple/tests.rs

@@ -1408,14 +1408,16 @@ impl fmt::Display for StackProtector {
 
 macro_rules! supported_targets {
     ( $(($triple:literal, $module:ident),)+ ) => {
-        $(mod $module;)+
+        mod targets {
+            $(pub(crate) mod $module;)+
+        }
 
         /// List of supported targets
         pub const TARGETS: &[&str] = &[$($triple),+];
 
         fn load_builtin(target: &str) -> Option<Target> {
             let mut t = match target {
-                $( $triple => $module::target(), )+
+                $( $triple => targets::$module::target(), )+
                 _ => return None,
             };
             t.is_builtin = true;
@@ -1431,7 +1433,7 @@ macro_rules! supported_targets {
             $(
                 #[test] // `#[test]`
                 fn $module() {
-                    tests_impl::test_target(super::$module::target());
+                    tests_impl::test_target(crate::spec::targets::$module::target());
                 }
             )+
         }

Diff for: compiler/rustc_target/src/spec/mod.rs

@@ -0,0 +1 @@
+pub use crate::spec::targets::aarch64_unknown_fuchsia::target;

Diff for: compiler/rustc_target/src/spec/aarch64_apple_darwin.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs

@@ -1,4 +1,4 @@
-use super::{base, RelocModel, Target, TargetOptions};
+use crate::spec::{base, RelocModel, Target, TargetOptions};
 
 pub fn target() -> Target {
     let base = base::solid::opts("asp3");

Diff for: compiler/rustc_target/src/spec/aarch64_apple_ios.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_apple_ios.rs

@@ -1,4 +1,4 @@
-use super::{Cc, LinkerFlavor, Lld, PanicStrategy, RelroLevel, Target, TargetOptions};
+use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, RelroLevel, Target, TargetOptions};
 
 const LINKER_SCRIPT: &str = include_str!("./aarch64_nintendo_switch_freestanding_linker_script.ld");
 

Diff for: compiler/rustc_target/src/spec/aarch64_apple_ios_macabi.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs

@@ -1,7 +1,6 @@
+use crate::spec::SanitizerSet;
 use crate::spec::{base, Target, TargetOptions};
 
-use super::SanitizerSet;
-
 pub fn target() -> Target {
     let mut base = base::linux_ohos::opts();
     base.max_atomic_width = Some(128);

Diff for: compiler/rustc_target/src/spec/aarch64_apple_ios_sim.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs

@@ -6,7 +6,7 @@
 //
 // For example, `-C target-cpu=cortex-a53`.
 
-use super::{
+use crate::spec::{
     Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, SanitizerSet, Target, TargetOptions,
 };
 

Diff for: compiler/rustc_target/src/spec/aarch64_apple_tvos.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_apple_tvos.rs

@@ -6,7 +6,7 @@
 //
 // For example, `-C target-cpu=cortex-a53`.
 
-use super::{Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetOptions};
+use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetOptions};
 
 pub fn target() -> Target {
     let opts = TargetOptions {

Diff for: compiler/rustc_target/src/spec/aarch64_apple_tvos_sim.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs

@@ -1,4 +1,4 @@
-use super::{base, RelocModel, Target, TargetOptions};
+use crate::spec::{base, RelocModel, Target, TargetOptions};
 
 pub fn target() -> Target {
     let base = base::solid::opts("asp3");

Diff for: compiler/rustc_target/src/spec/aarch64_apple_watchos_sim.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_apple_watchos_sim.rs

@@ -1,4 +1,4 @@
-use super::{base, RelocModel, Target, TargetOptions};
+use crate::spec::{base, RelocModel, Target, TargetOptions};
 
 pub fn target() -> Target {
     let base = base::solid::opts("asp3");

Diff for: compiler/rustc_target/src/spec/aarch64_be_unknown_linux_gnu.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_be_unknown_linux_gnu.rs

@@ -14,7 +14,7 @@
 // - `relocation-model` set to `static`; also no PIE, no relro and no dynamic
 // linking. rationale: matches `thumb` targets
 
-use super::{Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetOptions};
+use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetOptions};
 
 pub fn target() -> Target {
     let opts = TargetOptions {

Diff for: compiler/rustc_target/src/spec/aarch64_be_unknown_linux_gnu_ilp32.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_be_unknown_linux_gnu_ilp32.rs

@@ -5,7 +5,7 @@
 // changes (list in `armv7a_none_eabi.rs`) to bring it closer to the bare-metal
 // `thumb` & `aarch64` targets.
 
-use super::{Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetOptions};
+use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetOptions};
 
 pub fn target() -> Target {
     let opts = TargetOptions {

Diff for: compiler/rustc_target/src/spec/aarch64_be_unknown_netbsd.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_be_unknown_netbsd.rs

@@ -1,4 +1,4 @@
-use super::{wasm32_unknown_emscripten, LinkerFlavor, Target};
+use crate::spec::{targets::wasm32_unknown_emscripten, LinkerFlavor, Target};
 
 pub fn target() -> Target {
     let mut target = wasm32_unknown_emscripten::target();

Diff for: compiler/rustc_target/src/spec/targets/aarch64_fuchsia.rs

@@ -1,5 +1,5 @@
-use super::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy, RelocModel};
-use super::{Target, TargetOptions};
+use crate::spec::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy, RelocModel};
+use crate::spec::{Target, TargetOptions};
 
 pub fn target() -> Target {
     Target {

Diff for: compiler/rustc_target/src/spec/aarch64_kmc_solid_asp3.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_kmc_solid_asp3.rs

@@ -1,5 +1,5 @@
-use super::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy, RelocModel};
-use super::{Target, TargetOptions};
+use crate::spec::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy, RelocModel};
+use crate::spec::{Target, TargetOptions};
 
 pub fn target() -> Target {
     Target {

Diff for: compiler/rustc_target/src/spec/aarch64_linux_android.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_linux_android.rs

@@ -1,8 +1,7 @@
+use crate::spec::SanitizerSet;
 use crate::spec::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy};
 use crate::spec::{RelocModel, Target, TargetOptions};
 
-use super::SanitizerSet;
-
 pub fn target() -> Target {
     Target {
         data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),

Diff for: compiler/rustc_target/src/spec/aarch64_nintendo_switch_freestanding.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_nintendo_switch_freestanding.rs

@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use super::{cvs, Cc, LinkerFlavor, Lld, Target, TargetOptions};
+use crate::spec::{cvs, Cc, LinkerFlavor, Lld, Target, TargetOptions};
 
 pub fn target() -> Target {
     let pre_link_args = TargetOptions::link_args(

Diff for: compiler/rustc_target/src/spec/aarch64_nintendo_switch_freestanding_linker_script.ld renamed to compiler/rustc_target/src/spec/targets/aarch64_nintendo_switch_freestanding_linker_script.ld

@@ -0,0 +1 @@
+pub use crate::spec::targets::x86_64_unknown_fuchsia::target;

Diff for: compiler/rustc_target/src/spec/aarch64_pc_windows_gnullvm.rs renamed to compiler/rustc_target/src/spec/targets/aarch64_pc_windows_gnullvm.rs

@@ -4,8 +4,8 @@
 // `target-cpu` compiler flags to opt-in more hardware-specific
 // features.
 
-use super::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy};
-use super::{RelroLevel, SanitizerSet, StackProbeType, Target, TargetOptions};
+use crate::spec::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy};
+use crate::spec::{RelroLevel, SanitizerSet, StackProbeType, Target, TargetOptions};
 
 pub fn target() -> Target {
     let opts = TargetOptions {