targets: move target specs to spec/targets

Signed-off-by: David Wood <david@davidtw.co>
rust-lang · GuillaumeGomez · Oct 27, 2023 · Nov 7, 2023 · Nov 7, 2023 · Nov 7, 2023
commit 1af256fe8aea69909e1bf068506a29ebbf82eccf
diff --git a/compiler/rustc_target/src/spec/aarch64_fuchsia.rs b/compiler/rustc_target/src/spec/aarch64_fuchsia.rs
diff --git a/compiler/rustc_target/src/spec/base/apple/tests.rs b/compiler/rustc_target/src/spec/base/apple/tests.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 --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.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 --git a/...c_target/src/spec/aarch64_apple_darwin.rs → .../src/spec/targets/aarch64_apple_darwin.rs b/...c_target/src/spec/aarch64_apple_darwin.rs → .../src/spec/targets/aarch64_apple_darwin.rs
diff --git a/...ustc_target/src/spec/aarch64_apple_ios.rs → ...get/src/spec/targets/aarch64_apple_ios.rs b/...ustc_target/src/spec/aarch64_apple_ios.rs → ...get/src/spec/targets/aarch64_apple_ios.rs
diff --git a/...rget/src/spec/aarch64_apple_ios_macabi.rs → .../spec/targets/aarch64_apple_ios_macabi.rs b/...rget/src/spec/aarch64_apple_ios_macabi.rs → .../spec/targets/aarch64_apple_ios_macabi.rs
diff --git a/..._target/src/spec/aarch64_apple_ios_sim.rs → ...src/spec/targets/aarch64_apple_ios_sim.rs b/..._target/src/spec/aarch64_apple_ios_sim.rs → ...src/spec/targets/aarch64_apple_ios_sim.rs
diff --git a/...stc_target/src/spec/aarch64_apple_tvos.rs → ...et/src/spec/targets/aarch64_apple_tvos.rs b/...stc_target/src/spec/aarch64_apple_tvos.rs → ...et/src/spec/targets/aarch64_apple_tvos.rs
diff --git a/...target/src/spec/aarch64_apple_tvos_sim.rs → ...rc/spec/targets/aarch64_apple_tvos_sim.rs b/...target/src/spec/aarch64_apple_tvos_sim.rs → ...rc/spec/targets/aarch64_apple_tvos_sim.rs
diff --git a/...get/src/spec/aarch64_apple_watchos_sim.rs → ...spec/targets/aarch64_apple_watchos_sim.rs b/...get/src/spec/aarch64_apple_watchos_sim.rs → ...spec/targets/aarch64_apple_watchos_sim.rs
diff --git a/.../src/spec/aarch64_be_unknown_linux_gnu.rs → ...c/targets/aarch64_be_unknown_linux_gnu.rs b/.../src/spec/aarch64_be_unknown_linux_gnu.rs → ...c/targets/aarch64_be_unknown_linux_gnu.rs
diff --git a/...pec/aarch64_be_unknown_linux_gnu_ilp32.rs → ...ets/aarch64_be_unknown_linux_gnu_ilp32.rs b/...pec/aarch64_be_unknown_linux_gnu_ilp32.rs → ...ets/aarch64_be_unknown_linux_gnu_ilp32.rs
diff --git a/...get/src/spec/aarch64_be_unknown_netbsd.rs → ...spec/targets/aarch64_be_unknown_netbsd.rs b/...get/src/spec/aarch64_be_unknown_netbsd.rs → ...spec/targets/aarch64_be_unknown_netbsd.rs
diff --git a/compiler/rustc_target/src/spec/targets/aarch64_fuchsia.rs b/compiler/rustc_target/src/spec/targets/aarch64_fuchsia.rs
@@ -0,0 +1 @@
+pub use crate::spec::targets::aarch64_unknown_fuchsia::target;
diff --git a/...target/src/spec/aarch64_kmc_solid_asp3.rs → ...rc/spec/targets/aarch64_kmc_solid_asp3.rs b/...target/src/spec/aarch64_kmc_solid_asp3.rs → ...rc/spec/targets/aarch64_kmc_solid_asp3.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 --git a/..._target/src/spec/aarch64_linux_android.rs → ...src/spec/targets/aarch64_linux_android.rs b/..._target/src/spec/aarch64_linux_android.rs → ...src/spec/targets/aarch64_linux_android.rs
diff --git a/...c/aarch64_nintendo_switch_freestanding.rs → ...s/aarch64_nintendo_switch_freestanding.rs b/...c/aarch64_nintendo_switch_freestanding.rs → ...s/aarch64_nintendo_switch_freestanding.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 --git a/...endo_switch_freestanding_linker_script.ld → ...endo_switch_freestanding_linker_script.ld b/...endo_switch_freestanding_linker_script.ld → ...endo_switch_freestanding_linker_script.ld
diff --git a/...et/src/spec/aarch64_pc_windows_gnullvm.rs → ...pec/targets/aarch64_pc_windows_gnullvm.rs b/...et/src/spec/aarch64_pc_windows_gnullvm.rs → ...pec/targets/aarch64_pc_windows_gnullvm.rs
diff --git a/...arget/src/spec/aarch64_pc_windows_msvc.rs → ...c/spec/targets/aarch64_pc_windows_msvc.rs b/...arget/src/spec/aarch64_pc_windows_msvc.rs → ...c/spec/targets/aarch64_pc_windows_msvc.rs
diff --git a/...arget/src/spec/aarch64_unknown_freebsd.rs → ...c/spec/targets/aarch64_unknown_freebsd.rs b/...arget/src/spec/aarch64_unknown_freebsd.rs → ...c/spec/targets/aarch64_unknown_freebsd.rs
diff --git a/...arget/src/spec/aarch64_unknown_fuchsia.rs → ...c/spec/targets/aarch64_unknown_fuchsia.rs b/...arget/src/spec/aarch64_unknown_fuchsia.rs → ...c/spec/targets/aarch64_unknown_fuchsia.rs
diff --git a/...target/src/spec/aarch64_unknown_hermit.rs → ...rc/spec/targets/aarch64_unknown_hermit.rs b/...target/src/spec/aarch64_unknown_hermit.rs → ...rc/spec/targets/aarch64_unknown_hermit.rs
diff --git a/...get/src/spec/aarch64_unknown_linux_gnu.rs → ...spec/targets/aarch64_unknown_linux_gnu.rs b/...get/src/spec/aarch64_unknown_linux_gnu.rs → ...spec/targets/aarch64_unknown_linux_gnu.rs
diff --git a/...c/spec/aarch64_unknown_linux_gnu_ilp32.rs → ...argets/aarch64_unknown_linux_gnu_ilp32.rs b/...c/spec/aarch64_unknown_linux_gnu_ilp32.rs → ...argets/aarch64_unknown_linux_gnu_ilp32.rs
diff --git a/...et/src/spec/aarch64_unknown_linux_musl.rs → ...pec/targets/aarch64_unknown_linux_musl.rs b/...et/src/spec/aarch64_unknown_linux_musl.rs → ...pec/targets/aarch64_unknown_linux_musl.rs
diff --git a/...et/src/spec/aarch64_unknown_linux_ohos.rs → ...pec/targets/aarch64_unknown_linux_ohos.rs b/...et/src/spec/aarch64_unknown_linux_ohos.rs → ...pec/targets/aarch64_unknown_linux_ohos.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 --git a/...target/src/spec/aarch64_unknown_netbsd.rs → ...rc/spec/targets/aarch64_unknown_netbsd.rs b/...target/src/spec/aarch64_unknown_netbsd.rs → ...rc/spec/targets/aarch64_unknown_netbsd.rs
diff --git a/...c_target/src/spec/aarch64_unknown_none.rs → .../src/spec/targets/aarch64_unknown_none.rs b/...c_target/src/spec/aarch64_unknown_none.rs → .../src/spec/targets/aarch64_unknown_none.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 --git a/...rc/spec/aarch64_unknown_none_softfloat.rs → ...targets/aarch64_unknown_none_softfloat.rs b/...rc/spec/aarch64_unknown_none_softfloat.rs → ...targets/aarch64_unknown_none_softfloat.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 --git a/...t/src/spec/aarch64_unknown_nto_qnx_710.rs → ...ec/targets/aarch64_unknown_nto_qnx_710.rs b/...t/src/spec/aarch64_unknown_nto_qnx_710.rs → ...ec/targets/aarch64_unknown_nto_qnx_710.rs
diff --git a/...arget/src/spec/aarch64_unknown_openbsd.rs → ...c/spec/targets/aarch64_unknown_openbsd.rs b/...arget/src/spec/aarch64_unknown_openbsd.rs → ...c/spec/targets/aarch64_unknown_openbsd.rs
diff --git a/..._target/src/spec/aarch64_unknown_redox.rs → ...src/spec/targets/aarch64_unknown_redox.rs b/..._target/src/spec/aarch64_unknown_redox.rs → ...src/spec/targets/aarch64_unknown_redox.rs
diff --git a/..._target/src/spec/aarch64_unknown_teeos.rs → ...src/spec/targets/aarch64_unknown_teeos.rs b/..._target/src/spec/aarch64_unknown_teeos.rs → ...src/spec/targets/aarch64_unknown_teeos.rs
diff --git a/...c_target/src/spec/aarch64_unknown_uefi.rs → .../src/spec/targets/aarch64_unknown_uefi.rs b/...c_target/src/spec/aarch64_unknown_uefi.rs → .../src/spec/targets/aarch64_unknown_uefi.rs
diff --git a/...rget/src/spec/aarch64_uwp_windows_msvc.rs → .../spec/targets/aarch64_uwp_windows_msvc.rs b/...rget/src/spec/aarch64_uwp_windows_msvc.rs → .../spec/targets/aarch64_uwp_windows_msvc.rs
diff --git a/...tc_target/src/spec/aarch64_wrs_vxworks.rs → ...t/src/spec/targets/aarch64_wrs_vxworks.rs b/...tc_target/src/spec/aarch64_wrs_vxworks.rs → ...t/src/spec/targets/aarch64_wrs_vxworks.rs
diff --git a/...target/src/spec/arm64_32_apple_watchos.rs → ...rc/spec/targets/arm64_32_apple_watchos.rs b/...target/src/spec/arm64_32_apple_watchos.rs → ...rc/spec/targets/arm64_32_apple_watchos.rs
diff --git a/..._target/src/spec/arm_linux_androideabi.rs → ...src/spec/targets/arm_linux_androideabi.rs b/..._target/src/spec/arm_linux_androideabi.rs → ...src/spec/targets/arm_linux_androideabi.rs
diff --git a/...get/src/spec/arm_unknown_linux_gnueabi.rs → ...spec/targets/arm_unknown_linux_gnueabi.rs b/...get/src/spec/arm_unknown_linux_gnueabi.rs → ...spec/targets/arm_unknown_linux_gnueabi.rs
diff --git a/...t/src/spec/arm_unknown_linux_gnueabihf.rs → ...ec/targets/arm_unknown_linux_gnueabihf.rs b/...t/src/spec/arm_unknown_linux_gnueabihf.rs → ...ec/targets/arm_unknown_linux_gnueabihf.rs
diff --git a/...et/src/spec/arm_unknown_linux_musleabi.rs → ...pec/targets/arm_unknown_linux_musleabi.rs b/...et/src/spec/arm_unknown_linux_musleabi.rs → ...pec/targets/arm_unknown_linux_musleabi.rs
diff --git a/.../src/spec/arm_unknown_linux_musleabihf.rs → ...c/targets/arm_unknown_linux_musleabihf.rs b/.../src/spec/arm_unknown_linux_musleabihf.rs → ...c/targets/arm_unknown_linux_musleabihf.rs
diff --git a/...t/src/spec/armeb_unknown_linux_gnueabi.rs → ...ec/targets/armeb_unknown_linux_gnueabi.rs b/...t/src/spec/armeb_unknown_linux_gnueabi.rs → ...ec/targets/armeb_unknown_linux_gnueabi.rs
diff --git a/...stc_target/src/spec/armebv7r_none_eabi.rs → ...et/src/spec/targets/armebv7r_none_eabi.rs b/...stc_target/src/spec/armebv7r_none_eabi.rs → ...et/src/spec/targets/armebv7r_none_eabi.rs
diff --git a/...c_target/src/spec/armebv7r_none_eabihf.rs → .../src/spec/targets/armebv7r_none_eabihf.rs b/...c_target/src/spec/armebv7r_none_eabihf.rs → .../src/spec/targets/armebv7r_none_eabihf.rs
diff --git a/...rustc_target/src/spec/armv4t_none_eabi.rs → ...rget/src/spec/targets/armv4t_none_eabi.rs b/...rustc_target/src/spec/armv4t_none_eabi.rs → ...rget/src/spec/targets/armv4t_none_eabi.rs
diff --git a/.../src/spec/armv4t_unknown_linux_gnueabi.rs → ...c/targets/armv4t_unknown_linux_gnueabi.rs b/.../src/spec/armv4t_unknown_linux_gnueabi.rs → ...c/targets/armv4t_unknown_linux_gnueabi.rs
diff --git a/...ustc_target/src/spec/armv5te_none_eabi.rs → ...get/src/spec/targets/armv5te_none_eabi.rs b/...ustc_target/src/spec/armv5te_none_eabi.rs → ...get/src/spec/targets/armv5te_none_eabi.rs
diff --git a/...src/spec/armv5te_unknown_linux_gnueabi.rs → .../targets/armv5te_unknown_linux_gnueabi.rs b/...src/spec/armv5te_unknown_linux_gnueabi.rs → .../targets/armv5te_unknown_linux_gnueabi.rs
diff --git a/...rc/spec/armv5te_unknown_linux_musleabi.rs → ...targets/armv5te_unknown_linux_musleabi.rs b/...rc/spec/armv5te_unknown_linux_musleabi.rs → ...targets/armv5te_unknown_linux_musleabi.rs
diff --git a/.../spec/armv5te_unknown_linux_uclibceabi.rs → ...rgets/armv5te_unknown_linux_uclibceabi.rs b/.../spec/armv5te_unknown_linux_uclibceabi.rs → ...rgets/armv5te_unknown_linux_uclibceabi.rs
diff --git a/..._target/src/spec/armv6_unknown_freebsd.rs → ...src/spec/targets/armv6_unknown_freebsd.rs b/..._target/src/spec/armv6_unknown_freebsd.rs → ...src/spec/targets/armv6_unknown_freebsd.rs
diff --git a/...t/src/spec/armv6_unknown_netbsd_eabihf.rs → ...ec/targets/armv6_unknown_netbsd_eabihf.rs b/...t/src/spec/armv6_unknown_netbsd_eabihf.rs → ...ec/targets/armv6_unknown_netbsd_eabihf.rs
diff --git a/...tc_target/src/spec/armv6k_nintendo_3ds.rs → ...t/src/spec/targets/armv6k_nintendo_3ds.rs b/...tc_target/src/spec/armv6k_nintendo_3ds.rs → ...t/src/spec/targets/armv6k_nintendo_3ds.rs
diff --git a/...arget/src/spec/armv7_linux_androideabi.rs → ...c/spec/targets/armv7_linux_androideabi.rs b/...arget/src/spec/armv7_linux_androideabi.rs → ...c/spec/targets/armv7_linux_androideabi.rs
diff --git a/.../src/spec/armv7_sony_vita_newlibeabihf.rs → ...c/targets/armv7_sony_vita_newlibeabihf.rs b/.../src/spec/armv7_sony_vita_newlibeabihf.rs → ...c/targets/armv7_sony_vita_newlibeabihf.rs
diff --git a/..._target/src/spec/armv7_unknown_freebsd.rs → ...src/spec/targets/armv7_unknown_freebsd.rs b/..._target/src/spec/armv7_unknown_freebsd.rs → ...src/spec/targets/armv7_unknown_freebsd.rs
diff --git a/...t/src/spec/armv7_unknown_linux_gnueabi.rs → ...ec/targets/armv7_unknown_linux_gnueabi.rs b/...t/src/spec/armv7_unknown_linux_gnueabi.rs → ...ec/targets/armv7_unknown_linux_gnueabi.rs
diff --git a/...src/spec/armv7_unknown_linux_gnueabihf.rs → .../targets/armv7_unknown_linux_gnueabihf.rs b/...src/spec/armv7_unknown_linux_gnueabihf.rs → .../targets/armv7_unknown_linux_gnueabihf.rs
diff --git a/.../src/spec/armv7_unknown_linux_musleabi.rs → ...c/targets/armv7_unknown_linux_musleabi.rs b/.../src/spec/armv7_unknown_linux_musleabi.rs → ...c/targets/armv7_unknown_linux_musleabi.rs
diff --git a/...rc/spec/armv7_unknown_linux_musleabihf.rs → ...targets/armv7_unknown_linux_musleabihf.rs b/...rc/spec/armv7_unknown_linux_musleabihf.rs → ...targets/armv7_unknown_linux_musleabihf.rs
diff --git a/...rget/src/spec/armv7_unknown_linux_ohos.rs → .../spec/targets/armv7_unknown_linux_ohos.rs b/...rget/src/spec/armv7_unknown_linux_ohos.rs → .../spec/targets/armv7_unknown_linux_ohos.rs
diff --git a/...rc/spec/armv7_unknown_linux_uclibceabi.rs → ...targets/armv7_unknown_linux_uclibceabi.rs b/...rc/spec/armv7_unknown_linux_uclibceabi.rs → ...targets/armv7_unknown_linux_uclibceabi.rs
diff --git a/.../spec/armv7_unknown_linux_uclibceabihf.rs → ...rgets/armv7_unknown_linux_uclibceabihf.rs b/.../spec/armv7_unknown_linux_uclibceabihf.rs → ...rgets/armv7_unknown_linux_uclibceabihf.rs
diff --git a/...t/src/spec/armv7_unknown_netbsd_eabihf.rs → ...ec/targets/armv7_unknown_netbsd_eabihf.rs b/...t/src/spec/armv7_unknown_netbsd_eabihf.rs → ...ec/targets/armv7_unknown_netbsd_eabihf.rs
diff --git a/...rget/src/spec/armv7_wrs_vxworks_eabihf.rs → .../spec/targets/armv7_wrs_vxworks_eabihf.rs b/...rget/src/spec/armv7_wrs_vxworks_eabihf.rs → .../spec/targets/armv7_wrs_vxworks_eabihf.rs
diff --git a/...et/src/spec/armv7a_kmc_solid_asp3_eabi.rs → ...pec/targets/armv7a_kmc_solid_asp3_eabi.rs b/...et/src/spec/armv7a_kmc_solid_asp3_eabi.rs → ...pec/targets/armv7a_kmc_solid_asp3_eabi.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 --git a/.../src/spec/armv7a_kmc_solid_asp3_eabihf.rs → ...c/targets/armv7a_kmc_solid_asp3_eabihf.rs b/.../src/spec/armv7a_kmc_solid_asp3_eabihf.rs → ...c/targets/armv7a_kmc_solid_asp3_eabihf.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 --git a/...rustc_target/src/spec/armv7a_none_eabi.rs → ...rget/src/spec/targets/armv7a_none_eabi.rs b/...rustc_target/src/spec/armv7a_none_eabi.rs → ...rget/src/spec/targets/armv7a_none_eabi.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 --git a/...stc_target/src/spec/armv7a_none_eabihf.rs → ...et/src/spec/targets/armv7a_none_eabihf.rs b/...stc_target/src/spec/armv7a_none_eabihf.rs → ...et/src/spec/targets/armv7a_none_eabihf.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 --git a/...c_target/src/spec/armv7k_apple_watchos.rs → .../src/spec/targets/armv7k_apple_watchos.rs b/...c_target/src/spec/armv7k_apple_watchos.rs → .../src/spec/targets/armv7k_apple_watchos.rs
diff --git a/...rustc_target/src/spec/armv7r_none_eabi.rs → ...rget/src/spec/targets/armv7r_none_eabi.rs b/...rustc_target/src/spec/armv7r_none_eabi.rs → ...rget/src/spec/targets/armv7r_none_eabi.rs
diff --git a/...stc_target/src/spec/armv7r_none_eabihf.rs → ...et/src/spec/targets/armv7r_none_eabihf.rs b/...stc_target/src/spec/armv7r_none_eabihf.rs → ...et/src/spec/targets/armv7r_none_eabihf.rs
diff --git a/...rustc_target/src/spec/armv7s_apple_ios.rs → ...rget/src/spec/targets/armv7s_apple_ios.rs b/...rustc_target/src/spec/armv7s_apple_ios.rs → ...rget/src/spec/targets/armv7s_apple_ios.rs
diff --git a/...rget/src/spec/asmjs_unknown_emscripten.rs → .../spec/targets/asmjs_unknown_emscripten.rs b/...rget/src/spec/asmjs_unknown_emscripten.rs → .../spec/targets/asmjs_unknown_emscripten.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 --git a/...get/src/spec/avr_unknown_gnu_atmega328.rs → ...spec/targets/avr_unknown_gnu_atmega328.rs b/...get/src/spec/avr_unknown_gnu_atmega328.rs → ...spec/targets/avr_unknown_gnu_atmega328.rs
diff --git a/...stc_target/src/spec/bpfeb_unknown_none.rs → ...et/src/spec/targets/bpfeb_unknown_none.rs b/...stc_target/src/spec/bpfeb_unknown_none.rs → ...et/src/spec/targets/bpfeb_unknown_none.rs
diff --git a/...stc_target/src/spec/bpfel_unknown_none.rs → ...et/src/spec/targets/bpfel_unknown_none.rs b/...stc_target/src/spec/bpfel_unknown_none.rs → ...et/src/spec/targets/bpfel_unknown_none.rs
diff --git a/...t/src/spec/csky_unknown_linux_gnuabiv2.rs → ...ec/targets/csky_unknown_linux_gnuabiv2.rs b/...t/src/spec/csky_unknown_linux_gnuabiv2.rs → ...ec/targets/csky_unknown_linux_gnuabiv2.rs
diff --git a/...src/spec/csky_unknown_linux_gnuabiv2hf.rs → .../targets/csky_unknown_linux_gnuabiv2hf.rs b/...src/spec/csky_unknown_linux_gnuabiv2hf.rs → .../targets/csky_unknown_linux_gnuabiv2hf.rs
diff --git a/...et/src/spec/hexagon_unknown_linux_musl.rs → ...pec/targets/hexagon_unknown_linux_musl.rs b/...et/src/spec/hexagon_unknown_linux_musl.rs → ...pec/targets/hexagon_unknown_linux_musl.rs
diff --git a/...r/rustc_target/src/spec/i386_apple_ios.rs → ...target/src/spec/targets/i386_apple_ios.rs b/...r/rustc_target/src/spec/i386_apple_ios.rs → ...target/src/spec/targets/i386_apple_ios.rs
diff --git a/...target/src/spec/i386_unknown_linux_gnu.rs → ...rc/spec/targets/i386_unknown_linux_gnu.rs b/...target/src/spec/i386_unknown_linux_gnu.rs → ...rc/spec/targets/i386_unknown_linux_gnu.rs
diff --git a/...target/src/spec/i486_unknown_linux_gnu.rs → ...rc/spec/targets/i486_unknown_linux_gnu.rs b/...target/src/spec/i486_unknown_linux_gnu.rs → ...rc/spec/targets/i486_unknown_linux_gnu.rs
diff --git a/...stc_target/src/spec/i586_pc_nto_qnx700.rs → ...et/src/spec/targets/i586_pc_nto_qnx700.rs b/...stc_target/src/spec/i586_pc_nto_qnx700.rs → ...et/src/spec/targets/i586_pc_nto_qnx700.rs
diff --git a/...c_target/src/spec/i586_pc_windows_msvc.rs → .../src/spec/targets/i586_pc_windows_msvc.rs b/...c_target/src/spec/i586_pc_windows_msvc.rs → .../src/spec/targets/i586_pc_windows_msvc.rs
diff --git a/...target/src/spec/i586_unknown_linux_gnu.rs → ...rc/spec/targets/i586_unknown_linux_gnu.rs b/...target/src/spec/i586_unknown_linux_gnu.rs → ...rc/spec/targets/i586_unknown_linux_gnu.rs
diff --git a/...arget/src/spec/i586_unknown_linux_musl.rs → ...c/spec/targets/i586_unknown_linux_musl.rs b/...arget/src/spec/i586_unknown_linux_musl.rs → ...c/spec/targets/i586_unknown_linux_musl.rs
diff --git a/...tc_target/src/spec/i586_unknown_netbsd.rs → ...t/src/spec/targets/i586_unknown_netbsd.rs b/...tc_target/src/spec/i586_unknown_netbsd.rs → ...t/src/spec/targets/i586_unknown_netbsd.rs
diff --git a/...ustc_target/src/spec/i686_apple_darwin.rs → ...get/src/spec/targets/i686_apple_darwin.rs b/...ustc_target/src/spec/i686_apple_darwin.rs → ...get/src/spec/targets/i686_apple_darwin.rs
diff --git a/...stc_target/src/spec/i686_linux_android.rs → ...et/src/spec/targets/i686_linux_android.rs b/...stc_target/src/spec/i686_linux_android.rs → ...et/src/spec/targets/i686_linux_android.rs
diff --git a/...tc_target/src/spec/i686_pc_windows_gnu.rs → ...t/src/spec/targets/i686_pc_windows_gnu.rs b/...tc_target/src/spec/i686_pc_windows_gnu.rs → ...t/src/spec/targets/i686_pc_windows_gnu.rs
diff --git a/...arget/src/spec/i686_pc_windows_gnullvm.rs → ...c/spec/targets/i686_pc_windows_gnullvm.rs b/...arget/src/spec/i686_pc_windows_gnullvm.rs → ...c/spec/targets/i686_pc_windows_gnullvm.rs
diff --git a/...c_target/src/spec/i686_pc_windows_msvc.rs → .../src/spec/targets/i686_pc_windows_msvc.rs b/...c_target/src/spec/i686_pc_windows_msvc.rs → .../src/spec/targets/i686_pc_windows_msvc.rs
diff --git a/...c_target/src/spec/i686_unknown_freebsd.rs → .../src/spec/targets/i686_unknown_freebsd.rs b/...c_target/src/spec/i686_unknown_freebsd.rs → .../src/spec/targets/i686_unknown_freebsd.rs
diff --git a/...stc_target/src/spec/i686_unknown_haiku.rs → ...et/src/spec/targets/i686_unknown_haiku.rs b/...stc_target/src/spec/i686_unknown_haiku.rs → ...et/src/spec/targets/i686_unknown_haiku.rs
diff --git a/..._target/src/spec/i686_unknown_hurd_gnu.rs → ...src/spec/targets/i686_unknown_hurd_gnu.rs b/..._target/src/spec/i686_unknown_hurd_gnu.rs → ...src/spec/targets/i686_unknown_hurd_gnu.rs
diff --git a/...target/src/spec/i686_unknown_linux_gnu.rs → ...rc/spec/targets/i686_unknown_linux_gnu.rs b/...target/src/spec/i686_unknown_linux_gnu.rs → ...rc/spec/targets/i686_unknown_linux_gnu.rs
diff --git a/...arget/src/spec/i686_unknown_linux_musl.rs → ...c/spec/targets/i686_unknown_linux_musl.rs b/...arget/src/spec/i686_unknown_linux_musl.rs → ...c/spec/targets/i686_unknown_linux_musl.rs
diff --git a/...tc_target/src/spec/i686_unknown_netbsd.rs → ...t/src/spec/targets/i686_unknown_netbsd.rs b/...tc_target/src/spec/i686_unknown_netbsd.rs → ...t/src/spec/targets/i686_unknown_netbsd.rs
diff --git a/...c_target/src/spec/i686_unknown_openbsd.rs → .../src/spec/targets/i686_unknown_openbsd.rs b/...c_target/src/spec/i686_unknown_openbsd.rs → .../src/spec/targets/i686_unknown_openbsd.rs
diff --git a/...ustc_target/src/spec/i686_unknown_uefi.rs → ...get/src/spec/targets/i686_unknown_uefi.rs b/...ustc_target/src/spec/i686_unknown_uefi.rs → ...get/src/spec/targets/i686_unknown_uefi.rs
diff --git a/...c_target/src/spec/i686_uwp_windows_gnu.rs → .../src/spec/targets/i686_uwp_windows_gnu.rs b/...c_target/src/spec/i686_uwp_windows_gnu.rs → .../src/spec/targets/i686_uwp_windows_gnu.rs
diff --git a/..._target/src/spec/i686_uwp_windows_msvc.rs → ...src/spec/targets/i686_uwp_windows_msvc.rs b/..._target/src/spec/i686_uwp_windows_msvc.rs → ...src/spec/targets/i686_uwp_windows_msvc.rs
diff --git a/...rustc_target/src/spec/i686_wrs_vxworks.rs → ...rget/src/spec/targets/i686_wrs_vxworks.rs b/...rustc_target/src/spec/i686_wrs_vxworks.rs → ...rget/src/spec/targets/i686_wrs_vxworks.rs
diff --git a/...src/spec/loongarch64_unknown_linux_gnu.rs → .../targets/loongarch64_unknown_linux_gnu.rs b/...src/spec/loongarch64_unknown_linux_gnu.rs → .../targets/loongarch64_unknown_linux_gnu.rs
diff --git a/...rget/src/spec/loongarch64_unknown_none.rs → .../spec/targets/loongarch64_unknown_none.rs b/...rget/src/spec/loongarch64_unknown_none.rs → .../spec/targets/loongarch64_unknown_none.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 --git a/...pec/loongarch64_unknown_none_softfloat.rs → ...ets/loongarch64_unknown_none_softfloat.rs b/...pec/loongarch64_unknown_none_softfloat.rs → ...ets/loongarch64_unknown_none_softfloat.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 --git a/...target/src/spec/m68k_unknown_linux_gnu.rs → ...rc/spec/targets/m68k_unknown_linux_gnu.rs b/...target/src/spec/m68k_unknown_linux_gnu.rs → ...rc/spec/targets/m68k_unknown_linux_gnu.rs
diff --git a/...get/src/spec/mips64_openwrt_linux_musl.rs → ...spec/targets/mips64_openwrt_linux_musl.rs b/...get/src/spec/mips64_openwrt_linux_musl.rs → ...spec/targets/mips64_openwrt_linux_musl.rs
diff --git a/...src/spec/mips64_unknown_linux_gnuabi64.rs → .../targets/mips64_unknown_linux_gnuabi64.rs b/...src/spec/mips64_unknown_linux_gnuabi64.rs → .../targets/mips64_unknown_linux_gnuabi64.rs
diff --git a/...rc/spec/mips64_unknown_linux_muslabi64.rs → ...targets/mips64_unknown_linux_muslabi64.rs b/...rc/spec/mips64_unknown_linux_muslabi64.rs → ...targets/mips64_unknown_linux_muslabi64.rs
diff --git a/...c/spec/mips64el_unknown_linux_gnuabi64.rs → ...argets/mips64el_unknown_linux_gnuabi64.rs b/...c/spec/mips64el_unknown_linux_gnuabi64.rs → ...argets/mips64el_unknown_linux_gnuabi64.rs
diff --git a/.../spec/mips64el_unknown_linux_muslabi64.rs → ...rgets/mips64el_unknown_linux_muslabi64.rs b/.../spec/mips64el_unknown_linux_muslabi64.rs → ...rgets/mips64el_unknown_linux_muslabi64.rs
diff --git a/...target/src/spec/mips_unknown_linux_gnu.rs → ...rc/spec/targets/mips_unknown_linux_gnu.rs b/...target/src/spec/mips_unknown_linux_gnu.rs → ...rc/spec/targets/mips_unknown_linux_gnu.rs
diff --git a/...arget/src/spec/mips_unknown_linux_musl.rs → ...c/spec/targets/mips_unknown_linux_musl.rs b/...arget/src/spec/mips_unknown_linux_musl.rs → ...c/spec/targets/mips_unknown_linux_musl.rs
diff --git a/...get/src/spec/mips_unknown_linux_uclibc.rs → ...spec/targets/mips_unknown_linux_uclibc.rs b/...get/src/spec/mips_unknown_linux_uclibc.rs → ...spec/targets/mips_unknown_linux_uclibc.rs
diff --git a/.../rustc_target/src/spec/mipsel_sony_psp.rs → ...arget/src/spec/targets/mipsel_sony_psp.rs b/.../rustc_target/src/spec/mipsel_sony_psp.rs → ...arget/src/spec/targets/mipsel_sony_psp.rs
diff --git a/...src/spec/mipsel_sony_psp_linker_script.ld → .../targets/mipsel_sony_psp_linker_script.ld b/...src/spec/mipsel_sony_psp_linker_script.ld → .../targets/mipsel_sony_psp_linker_script.ld
diff --git a/.../rustc_target/src/spec/mipsel_sony_psx.rs → ...arget/src/spec/targets/mipsel_sony_psx.rs b/.../rustc_target/src/spec/mipsel_sony_psx.rs → ...arget/src/spec/targets/mipsel_sony_psx.rs
diff --git a/...rget/src/spec/mipsel_unknown_linux_gnu.rs → .../spec/targets/mipsel_unknown_linux_gnu.rs b/...rget/src/spec/mipsel_unknown_linux_gnu.rs → .../spec/targets/mipsel_unknown_linux_gnu.rs
diff --git a/...get/src/spec/mipsel_unknown_linux_musl.rs → ...spec/targets/mipsel_unknown_linux_musl.rs b/...get/src/spec/mipsel_unknown_linux_musl.rs → ...spec/targets/mipsel_unknown_linux_musl.rs
diff --git a/...t/src/spec/mipsel_unknown_linux_uclibc.rs → ...ec/targets/mipsel_unknown_linux_uclibc.rs b/...t/src/spec/mipsel_unknown_linux_uclibc.rs → ...ec/targets/mipsel_unknown_linux_uclibc.rs
diff --git a/..._target/src/spec/mipsel_unknown_netbsd.rs → ...src/spec/targets/mipsel_unknown_netbsd.rs b/..._target/src/spec/mipsel_unknown_netbsd.rs → ...src/spec/targets/mipsel_unknown_netbsd.rs
diff --git a/...tc_target/src/spec/mipsel_unknown_none.rs → ...t/src/spec/targets/mipsel_unknown_none.rs b/...tc_target/src/spec/mipsel_unknown_none.rs → ...t/src/spec/targets/mipsel_unknown_none.rs
diff --git a/...src/spec/mipsisa32r6_unknown_linux_gnu.rs → .../targets/mipsisa32r6_unknown_linux_gnu.rs b/...src/spec/mipsisa32r6_unknown_linux_gnu.rs → .../targets/mipsisa32r6_unknown_linux_gnu.rs
diff --git a/...c/spec/mipsisa32r6el_unknown_linux_gnu.rs → ...argets/mipsisa32r6el_unknown_linux_gnu.rs b/...c/spec/mipsisa32r6el_unknown_linux_gnu.rs → ...argets/mipsisa32r6el_unknown_linux_gnu.rs
diff --git a/...pec/mipsisa64r6_unknown_linux_gnuabi64.rs → ...ets/mipsisa64r6_unknown_linux_gnuabi64.rs b/...pec/mipsisa64r6_unknown_linux_gnuabi64.rs → ...ets/mipsisa64r6_unknown_linux_gnuabi64.rs
diff --git a/...c/mipsisa64r6el_unknown_linux_gnuabi64.rs → ...s/mipsisa64r6el_unknown_linux_gnuabi64.rs b/...c/mipsisa64r6el_unknown_linux_gnuabi64.rs → ...s/mipsisa64r6el_unknown_linux_gnuabi64.rs
diff --git a/.../rustc_target/src/spec/msp430_none_elf.rs → ...arget/src/spec/targets/msp430_none_elf.rs b/.../rustc_target/src/spec/msp430_none_elf.rs → ...arget/src/spec/targets/msp430_none_elf.rs
diff --git a/...tc_target/src/spec/nvptx64_nvidia_cuda.rs → ...t/src/spec/targets/nvptx64_nvidia_cuda.rs b/...tc_target/src/spec/nvptx64_nvidia_cuda.rs → ...t/src/spec/targets/nvptx64_nvidia_cuda.rs
diff --git a/...ustc_target/src/spec/powerpc64_ibm_aix.rs → ...get/src/spec/targets/powerpc64_ibm_aix.rs b/...ustc_target/src/spec/powerpc64_ibm_aix.rs → ...get/src/spec/targets/powerpc64_ibm_aix.rs
diff --git a/...get/src/spec/powerpc64_unknown_freebsd.rs → ...spec/targets/powerpc64_unknown_freebsd.rs b/...get/src/spec/powerpc64_unknown_freebsd.rs → ...spec/targets/powerpc64_unknown_freebsd.rs
diff --git a/...t/src/spec/powerpc64_unknown_linux_gnu.rs → ...ec/targets/powerpc64_unknown_linux_gnu.rs b/...t/src/spec/powerpc64_unknown_linux_gnu.rs → ...ec/targets/powerpc64_unknown_linux_gnu.rs
diff --git a/.../src/spec/powerpc64_unknown_linux_musl.rs → ...c/targets/powerpc64_unknown_linux_musl.rs b/.../src/spec/powerpc64_unknown_linux_musl.rs → ...c/targets/powerpc64_unknown_linux_musl.rs
diff --git a/...get/src/spec/powerpc64_unknown_openbsd.rs → ...spec/targets/powerpc64_unknown_openbsd.rs b/...get/src/spec/powerpc64_unknown_openbsd.rs → ...spec/targets/powerpc64_unknown_openbsd.rs
diff --git a/..._target/src/spec/powerpc64_wrs_vxworks.rs → ...src/spec/targets/powerpc64_wrs_vxworks.rs b/..._target/src/spec/powerpc64_wrs_vxworks.rs → ...src/spec/targets/powerpc64_wrs_vxworks.rs
diff --git a/...t/src/spec/powerpc64le_unknown_freebsd.rs → ...ec/targets/powerpc64le_unknown_freebsd.rs b/...t/src/spec/powerpc64le_unknown_freebsd.rs → ...ec/targets/powerpc64le_unknown_freebsd.rs
diff --git a/...src/spec/powerpc64le_unknown_linux_gnu.rs → .../targets/powerpc64le_unknown_linux_gnu.rs b/...src/spec/powerpc64le_unknown_linux_gnu.rs → .../targets/powerpc64le_unknown_linux_gnu.rs
diff --git a/...rc/spec/powerpc64le_unknown_linux_musl.rs → ...targets/powerpc64le_unknown_linux_musl.rs b/...rc/spec/powerpc64le_unknown_linux_musl.rs → ...targets/powerpc64le_unknown_linux_musl.rs
diff --git a/...arget/src/spec/powerpc_unknown_freebsd.rs → ...c/spec/targets/powerpc_unknown_freebsd.rs b/...arget/src/spec/powerpc_unknown_freebsd.rs → ...c/spec/targets/powerpc_unknown_freebsd.rs
diff --git a/...get/src/spec/powerpc_unknown_linux_gnu.rs → ...spec/targets/powerpc_unknown_linux_gnu.rs b/...get/src/spec/powerpc_unknown_linux_gnu.rs → ...spec/targets/powerpc_unknown_linux_gnu.rs
diff --git a/.../src/spec/powerpc_unknown_linux_gnuspe.rs → ...c/targets/powerpc_unknown_linux_gnuspe.rs b/.../src/spec/powerpc_unknown_linux_gnuspe.rs → ...c/targets/powerpc_unknown_linux_gnuspe.rs
diff --git a/...et/src/spec/powerpc_unknown_linux_musl.rs → ...pec/targets/powerpc_unknown_linux_musl.rs b/...et/src/spec/powerpc_unknown_linux_musl.rs → ...pec/targets/powerpc_unknown_linux_musl.rs
diff --git a/...target/src/spec/powerpc_unknown_netbsd.rs → ...rc/spec/targets/powerpc_unknown_netbsd.rs b/...target/src/spec/powerpc_unknown_netbsd.rs → ...rc/spec/targets/powerpc_unknown_netbsd.rs
diff --git a/...arget/src/spec/powerpc_unknown_openbsd.rs → ...c/spec/targets/powerpc_unknown_openbsd.rs b/...arget/src/spec/powerpc_unknown_openbsd.rs → ...c/spec/targets/powerpc_unknown_openbsd.rs
diff --git a/...tc_target/src/spec/powerpc_wrs_vxworks.rs → ...t/src/spec/targets/powerpc_wrs_vxworks.rs b/...tc_target/src/spec/powerpc_wrs_vxworks.rs → ...t/src/spec/targets/powerpc_wrs_vxworks.rs
diff --git a/...arget/src/spec/powerpc_wrs_vxworks_spe.rs → ...c/spec/targets/powerpc_wrs_vxworks_spe.rs b/...arget/src/spec/powerpc_wrs_vxworks_spe.rs → ...c/spec/targets/powerpc_wrs_vxworks_spe.rs
diff --git a/...t/src/spec/riscv32gc_unknown_linux_gnu.rs → ...ec/targets/riscv32gc_unknown_linux_gnu.rs b/...t/src/spec/riscv32gc_unknown_linux_gnu.rs → ...ec/targets/riscv32gc_unknown_linux_gnu.rs
diff --git a/.../src/spec/riscv32gc_unknown_linux_musl.rs → ...c/targets/riscv32gc_unknown_linux_musl.rs b/.../src/spec/riscv32gc_unknown_linux_musl.rs → ...c/targets/riscv32gc_unknown_linux_musl.rs
diff --git a/...get/src/spec/riscv32i_unknown_none_elf.rs → ...spec/targets/riscv32i_unknown_none_elf.rs b/...get/src/spec/riscv32i_unknown_none_elf.rs → ...spec/targets/riscv32i_unknown_none_elf.rs
diff --git a/...et/src/spec/riscv32im_unknown_none_elf.rs → ...pec/targets/riscv32im_unknown_none_elf.rs b/...et/src/spec/riscv32im_unknown_none_elf.rs → ...pec/targets/riscv32im_unknown_none_elf.rs
diff --git a/...target/src/spec/riscv32imac_esp_espidf.rs → ...rc/spec/targets/riscv32imac_esp_espidf.rs b/...target/src/spec/riscv32imac_esp_espidf.rs → ...rc/spec/targets/riscv32imac_esp_espidf.rs
diff --git a/.../src/spec/riscv32imac_unknown_none_elf.rs → ...c/targets/riscv32imac_unknown_none_elf.rs b/.../src/spec/riscv32imac_unknown_none_elf.rs → ...c/targets/riscv32imac_unknown_none_elf.rs
diff --git a/.../src/spec/riscv32imac_unknown_xous_elf.rs → ...c/targets/riscv32imac_unknown_xous_elf.rs b/.../src/spec/riscv32imac_unknown_xous_elf.rs → ...c/targets/riscv32imac_unknown_xous_elf.rs
diff --git a/..._target/src/spec/riscv32imc_esp_espidf.rs → ...src/spec/targets/riscv32imc_esp_espidf.rs b/..._target/src/spec/riscv32imc_esp_espidf.rs → ...src/spec/targets/riscv32imc_esp_espidf.rs
diff --git a/...t/src/spec/riscv32imc_unknown_none_elf.rs → ...ec/targets/riscv32imc_unknown_none_elf.rs b/...t/src/spec/riscv32imc_unknown_none_elf.rs → ...ec/targets/riscv32imc_unknown_none_elf.rs
diff --git a/..._target/src/spec/riscv64_linux_android.rs → ...src/spec/targets/riscv64_linux_android.rs b/..._target/src/spec/riscv64_linux_android.rs → ...src/spec/targets/riscv64_linux_android.rs
diff --git a/...get/src/spec/riscv64gc_unknown_freebsd.rs → ...spec/targets/riscv64gc_unknown_freebsd.rs b/...get/src/spec/riscv64gc_unknown_freebsd.rs → ...spec/targets/riscv64gc_unknown_freebsd.rs
diff --git a/...get/src/spec/riscv64gc_unknown_fuchsia.rs → ...spec/targets/riscv64gc_unknown_fuchsia.rs b/...get/src/spec/riscv64gc_unknown_fuchsia.rs → ...spec/targets/riscv64gc_unknown_fuchsia.rs
diff --git a/...rget/src/spec/riscv64gc_unknown_hermit.rs → .../spec/targets/riscv64gc_unknown_hermit.rs b/...rget/src/spec/riscv64gc_unknown_hermit.rs → .../spec/targets/riscv64gc_unknown_hermit.rs
diff --git a/...t/src/spec/riscv64gc_unknown_linux_gnu.rs → ...ec/targets/riscv64gc_unknown_linux_gnu.rs b/...t/src/spec/riscv64gc_unknown_linux_gnu.rs → ...ec/targets/riscv64gc_unknown_linux_gnu.rs
diff --git a/.../src/spec/riscv64gc_unknown_linux_musl.rs → ...c/targets/riscv64gc_unknown_linux_musl.rs b/.../src/spec/riscv64gc_unknown_linux_musl.rs → ...c/targets/riscv64gc_unknown_linux_musl.rs
diff --git a/...rget/src/spec/riscv64gc_unknown_netbsd.rs → .../spec/targets/riscv64gc_unknown_netbsd.rs b/...rget/src/spec/riscv64gc_unknown_netbsd.rs → .../spec/targets/riscv64gc_unknown_netbsd.rs
diff --git a/...et/src/spec/riscv64gc_unknown_none_elf.rs → ...pec/targets/riscv64gc_unknown_none_elf.rs b/...et/src/spec/riscv64gc_unknown_none_elf.rs → ...pec/targets/riscv64gc_unknown_none_elf.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 --git a/...get/src/spec/riscv64gc_unknown_openbsd.rs → ...spec/targets/riscv64gc_unknown_openbsd.rs b/...get/src/spec/riscv64gc_unknown_openbsd.rs → ...spec/targets/riscv64gc_unknown_openbsd.rs
diff --git a/.../src/spec/riscv64imac_unknown_none_elf.rs → ...c/targets/riscv64imac_unknown_none_elf.rs b/.../src/spec/riscv64imac_unknown_none_elf.rs → ...c/targets/riscv64imac_unknown_none_elf.rs
diff --git a/...arget/src/spec/s390x_unknown_linux_gnu.rs → ...c/spec/targets/s390x_unknown_linux_gnu.rs b/...arget/src/spec/s390x_unknown_linux_gnu.rs → ...c/spec/targets/s390x_unknown_linux_gnu.rs
diff --git a/...rget/src/spec/s390x_unknown_linux_musl.rs → .../spec/targets/s390x_unknown_linux_musl.rs b/...rget/src/spec/s390x_unknown_linux_musl.rs → .../spec/targets/s390x_unknown_linux_musl.rs
diff --git a/...get/src/spec/sparc64_unknown_linux_gnu.rs → ...spec/targets/sparc64_unknown_linux_gnu.rs b/...get/src/spec/sparc64_unknown_linux_gnu.rs → ...spec/targets/sparc64_unknown_linux_gnu.rs
diff --git a/...target/src/spec/sparc64_unknown_netbsd.rs → ...rc/spec/targets/sparc64_unknown_netbsd.rs b/...target/src/spec/sparc64_unknown_netbsd.rs → ...rc/spec/targets/sparc64_unknown_netbsd.rs
diff --git a/...arget/src/spec/sparc64_unknown_openbsd.rs → ...c/spec/targets/sparc64_unknown_openbsd.rs b/...arget/src/spec/sparc64_unknown_openbsd.rs → ...c/spec/targets/sparc64_unknown_openbsd.rs
diff --git a/...arget/src/spec/sparc_unknown_linux_gnu.rs → ...c/spec/targets/sparc_unknown_linux_gnu.rs b/...arget/src/spec/sparc_unknown_linux_gnu.rs → ...c/spec/targets/sparc_unknown_linux_gnu.rs
diff --git a/...target/src/spec/sparc_unknown_none_elf.rs → ...rc/spec/targets/sparc_unknown_none_elf.rs b/...target/src/spec/sparc_unknown_none_elf.rs → ...rc/spec/targets/sparc_unknown_none_elf.rs
diff --git a/...tc_target/src/spec/sparcv9_sun_solaris.rs → ...t/src/spec/targets/sparcv9_sun_solaris.rs b/...tc_target/src/spec/sparcv9_sun_solaris.rs → ...t/src/spec/targets/sparcv9_sun_solaris.rs
diff --git a/...stc_target/src/spec/thumbv4t_none_eabi.rs → ...et/src/spec/targets/thumbv4t_none_eabi.rs b/...stc_target/src/spec/thumbv4t_none_eabi.rs → ...et/src/spec/targets/thumbv4t_none_eabi.rs
diff --git a/...tc_target/src/spec/thumbv5te_none_eabi.rs → ...t/src/spec/targets/thumbv5te_none_eabi.rs b/...tc_target/src/spec/thumbv5te_none_eabi.rs → ...t/src/spec/targets/thumbv5te_none_eabi.rs
diff --git a/...stc_target/src/spec/thumbv6m_none_eabi.rs → ...et/src/spec/targets/thumbv6m_none_eabi.rs b/...stc_target/src/spec/thumbv6m_none_eabi.rs → ...et/src/spec/targets/thumbv6m_none_eabi.rs
diff --git a/...rget/src/spec/thumbv7a_pc_windows_msvc.rs → .../spec/targets/thumbv7a_pc_windows_msvc.rs b/...rget/src/spec/thumbv7a_pc_windows_msvc.rs → .../spec/targets/thumbv7a_pc_windows_msvc.rs
diff --git a/...get/src/spec/thumbv7a_uwp_windows_msvc.rs → ...spec/targets/thumbv7a_uwp_windows_msvc.rs b/...get/src/spec/thumbv7a_uwp_windows_msvc.rs → ...spec/targets/thumbv7a_uwp_windows_msvc.rs
diff --git a/...tc_target/src/spec/thumbv7em_none_eabi.rs → ...t/src/spec/targets/thumbv7em_none_eabi.rs b/...tc_target/src/spec/thumbv7em_none_eabi.rs → ...t/src/spec/targets/thumbv7em_none_eabi.rs
diff --git a/..._target/src/spec/thumbv7em_none_eabihf.rs → ...src/spec/targets/thumbv7em_none_eabihf.rs b/..._target/src/spec/thumbv7em_none_eabihf.rs → ...src/spec/targets/thumbv7em_none_eabihf.rs
diff --git a/...stc_target/src/spec/thumbv7m_none_eabi.rs → ...et/src/spec/targets/thumbv7m_none_eabi.rs b/...stc_target/src/spec/thumbv7m_none_eabi.rs → ...et/src/spec/targets/thumbv7m_none_eabi.rs
diff --git a/...src/spec/thumbv7neon_linux_androideabi.rs → .../targets/thumbv7neon_linux_androideabi.rs b/...src/spec/thumbv7neon_linux_androideabi.rs → .../targets/thumbv7neon_linux_androideabi.rs
diff --git a/...ec/thumbv7neon_unknown_linux_gnueabihf.rs → ...ts/thumbv7neon_unknown_linux_gnueabihf.rs b/...ec/thumbv7neon_unknown_linux_gnueabihf.rs → ...ts/thumbv7neon_unknown_linux_gnueabihf.rs
diff --git a/...c/thumbv7neon_unknown_linux_musleabihf.rs → ...s/thumbv7neon_unknown_linux_musleabihf.rs b/...c/thumbv7neon_unknown_linux_musleabihf.rs → ...s/thumbv7neon_unknown_linux_musleabihf.rs
diff --git a/...arget/src/spec/thumbv8m_base_none_eabi.rs → ...c/spec/targets/thumbv8m_base_none_eabi.rs b/...arget/src/spec/thumbv8m_base_none_eabi.rs → ...c/spec/targets/thumbv8m_base_none_eabi.rs
diff --git a/...arget/src/spec/thumbv8m_main_none_eabi.rs → ...c/spec/targets/thumbv8m_main_none_eabi.rs b/...arget/src/spec/thumbv8m_main_none_eabi.rs → ...c/spec/targets/thumbv8m_main_none_eabi.rs
diff --git a/...get/src/spec/thumbv8m_main_none_eabihf.rs → ...spec/targets/thumbv8m_main_none_eabihf.rs b/...get/src/spec/thumbv8m_main_none_eabihf.rs → ...spec/targets/thumbv8m_main_none_eabihf.rs
diff --git a/...get/src/spec/wasm32_unknown_emscripten.rs → ...spec/targets/wasm32_unknown_emscripten.rs b/...get/src/spec/wasm32_unknown_emscripten.rs → ...spec/targets/wasm32_unknown_emscripten.rs
diff --git a/...target/src/spec/wasm32_unknown_unknown.rs → ...rc/spec/targets/wasm32_unknown_unknown.rs b/...target/src/spec/wasm32_unknown_unknown.rs → ...rc/spec/targets/wasm32_unknown_unknown.rs
diff --git a/...iler/rustc_target/src/spec/wasm32_wasi.rs → ...tc_target/src/spec/targets/wasm32_wasi.rs b/...iler/rustc_target/src/spec/wasm32_wasi.rs → ...tc_target/src/spec/targets/wasm32_wasi.rs
diff --git a/.../src/spec/wasm32_wasi_preview1_threads.rs → ...c/targets/wasm32_wasi_preview1_threads.rs b/.../src/spec/wasm32_wasi_preview1_threads.rs → ...c/targets/wasm32_wasi_preview1_threads.rs
diff --git a/...target/src/spec/wasm64_unknown_unknown.rs → ...rc/spec/targets/wasm64_unknown_unknown.rs b/...target/src/spec/wasm64_unknown_unknown.rs → ...rc/spec/targets/wasm64_unknown_unknown.rs
diff --git a/...tc_target/src/spec/x86_64_apple_darwin.rs → ...t/src/spec/targets/x86_64_apple_darwin.rs b/...tc_target/src/spec/x86_64_apple_darwin.rs → ...t/src/spec/targets/x86_64_apple_darwin.rs
diff --git a/...rustc_target/src/spec/x86_64_apple_ios.rs → ...rget/src/spec/targets/x86_64_apple_ios.rs b/...rustc_target/src/spec/x86_64_apple_ios.rs → ...rget/src/spec/targets/x86_64_apple_ios.rs
diff --git a/...arget/src/spec/x86_64_apple_ios_macabi.rs → ...c/spec/targets/x86_64_apple_ios_macabi.rs b/...arget/src/spec/x86_64_apple_ios_macabi.rs → ...c/spec/targets/x86_64_apple_ios_macabi.rs
diff --git a/...ustc_target/src/spec/x86_64_apple_tvos.rs → ...get/src/spec/targets/x86_64_apple_tvos.rs b/...ustc_target/src/spec/x86_64_apple_tvos.rs → ...get/src/spec/targets/x86_64_apple_tvos.rs
diff --git a/...rget/src/spec/x86_64_apple_watchos_sim.rs → .../spec/targets/x86_64_apple_watchos_sim.rs b/...rget/src/spec/x86_64_apple_watchos_sim.rs → .../spec/targets/x86_64_apple_watchos_sim.rs
diff --git a/...t/src/spec/x86_64_fortanix_unknown_sgx.rs → ...ec/targets/x86_64_fortanix_unknown_sgx.rs b/...t/src/spec/x86_64_fortanix_unknown_sgx.rs → ...ec/targets/x86_64_fortanix_unknown_sgx.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 --git a/compiler/rustc_target/src/spec/targets/x86_64_fuchsia.rs b/compiler/rustc_target/src/spec/targets/x86_64_fuchsia.rs
@@ -0,0 +1 @@
+pub use crate::spec::targets::x86_64_unknown_fuchsia::target;
diff --git a/...c_target/src/spec/x86_64_linux_android.rs → .../src/spec/targets/x86_64_linux_android.rs b/...c_target/src/spec/x86_64_linux_android.rs → .../src/spec/targets/x86_64_linux_android.rs
diff --git a/...c_target/src/spec/x86_64_pc_nto_qnx710.rs → .../src/spec/targets/x86_64_pc_nto_qnx710.rs b/...c_target/src/spec/x86_64_pc_nto_qnx710.rs → .../src/spec/targets/x86_64_pc_nto_qnx710.rs
diff --git a/...ustc_target/src/spec/x86_64_pc_solaris.rs → ...get/src/spec/targets/x86_64_pc_solaris.rs b/...ustc_target/src/spec/x86_64_pc_solaris.rs → ...get/src/spec/targets/x86_64_pc_solaris.rs
diff --git a/..._target/src/spec/x86_64_pc_windows_gnu.rs → ...src/spec/targets/x86_64_pc_windows_gnu.rs b/..._target/src/spec/x86_64_pc_windows_gnu.rs → ...src/spec/targets/x86_64_pc_windows_gnu.rs
diff --git a/...get/src/spec/x86_64_pc_windows_gnullvm.rs → ...spec/targets/x86_64_pc_windows_gnullvm.rs b/...get/src/spec/x86_64_pc_windows_gnullvm.rs → ...spec/targets/x86_64_pc_windows_gnullvm.rs
diff --git a/...target/src/spec/x86_64_pc_windows_msvc.rs → ...rc/spec/targets/x86_64_pc_windows_msvc.rs b/...target/src/spec/x86_64_pc_windows_msvc.rs → ...rc/spec/targets/x86_64_pc_windows_msvc.rs
diff --git a/...stc_target/src/spec/x86_64_sun_solaris.rs → ...et/src/spec/targets/x86_64_sun_solaris.rs b/...stc_target/src/spec/x86_64_sun_solaris.rs → ...et/src/spec/targets/x86_64_sun_solaris.rs
diff --git a/...et/src/spec/x86_64_unikraft_linux_musl.rs → ...pec/targets/x86_64_unikraft_linux_musl.rs b/...et/src/spec/x86_64_unikraft_linux_musl.rs → ...pec/targets/x86_64_unikraft_linux_musl.rs
diff --git a/...rget/src/spec/x86_64_unknown_dragonfly.rs → .../spec/targets/x86_64_unknown_dragonfly.rs b/...rget/src/spec/x86_64_unknown_dragonfly.rs → .../spec/targets/x86_64_unknown_dragonfly.rs
diff --git a/...target/src/spec/x86_64_unknown_freebsd.rs → ...rc/spec/targets/x86_64_unknown_freebsd.rs b/...target/src/spec/x86_64_unknown_freebsd.rs → ...rc/spec/targets/x86_64_unknown_freebsd.rs
diff --git a/...target/src/spec/x86_64_unknown_fuchsia.rs → ...rc/spec/targets/x86_64_unknown_fuchsia.rs b/...target/src/spec/x86_64_unknown_fuchsia.rs → ...rc/spec/targets/x86_64_unknown_fuchsia.rs
diff --git a/...c_target/src/spec/x86_64_unknown_haiku.rs → .../src/spec/targets/x86_64_unknown_haiku.rs b/...c_target/src/spec/x86_64_unknown_haiku.rs → .../src/spec/targets/x86_64_unknown_haiku.rs
diff --git a/..._target/src/spec/x86_64_unknown_hermit.rs → ...src/spec/targets/x86_64_unknown_hermit.rs b/..._target/src/spec/x86_64_unknown_hermit.rs → ...src/spec/targets/x86_64_unknown_hermit.rs
diff --git a/...target/src/spec/x86_64_unknown_illumos.rs → ...rc/spec/targets/x86_64_unknown_illumos.rs b/...target/src/spec/x86_64_unknown_illumos.rs → ...rc/spec/targets/x86_64_unknown_illumos.rs
diff --git a/...et/src/spec/x86_64_unknown_l4re_uclibc.rs → ...pec/targets/x86_64_unknown_l4re_uclibc.rs b/...et/src/spec/x86_64_unknown_l4re_uclibc.rs → ...pec/targets/x86_64_unknown_l4re_uclibc.rs
diff --git a/...rget/src/spec/x86_64_unknown_linux_gnu.rs → .../spec/targets/x86_64_unknown_linux_gnu.rs b/...rget/src/spec/x86_64_unknown_linux_gnu.rs → .../spec/targets/x86_64_unknown_linux_gnu.rs
diff --git a/...t/src/spec/x86_64_unknown_linux_gnux32.rs → ...ec/targets/x86_64_unknown_linux_gnux32.rs b/...t/src/spec/x86_64_unknown_linux_gnux32.rs → ...ec/targets/x86_64_unknown_linux_gnux32.rs
diff --git a/...get/src/spec/x86_64_unknown_linux_musl.rs → ...spec/targets/x86_64_unknown_linux_musl.rs b/...get/src/spec/x86_64_unknown_linux_musl.rs → ...spec/targets/x86_64_unknown_linux_musl.rs
diff --git a/...get/src/spec/x86_64_unknown_linux_ohos.rs → ...spec/targets/x86_64_unknown_linux_ohos.rs b/...get/src/spec/x86_64_unknown_linux_ohos.rs → ...spec/targets/x86_64_unknown_linux_ohos.rs
diff --git a/..._target/src/spec/x86_64_unknown_netbsd.rs → ...src/spec/targets/x86_64_unknown_netbsd.rs b/..._target/src/spec/x86_64_unknown_netbsd.rs → ...src/spec/targets/x86_64_unknown_netbsd.rs
diff --git a/...tc_target/src/spec/x86_64_unknown_none.rs → ...t/src/spec/targets/x86_64_unknown_none.rs b/...tc_target/src/spec/x86_64_unknown_none.rs → ...t/src/spec/targets/x86_64_unknown_none.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 {

diff --git a/...target/src/spec/x86_64_unknown_openbsd.rs → ...rc/spec/targets/x86_64_unknown_openbsd.rs b/...target/src/spec/x86_64_unknown_openbsd.rs → ...rc/spec/targets/x86_64_unknown_openbsd.rs
diff --git a/...c_target/src/spec/x86_64_unknown_redox.rs → .../src/spec/targets/x86_64_unknown_redox.rs b/...c_target/src/spec/x86_64_unknown_redox.rs → .../src/spec/targets/x86_64_unknown_redox.rs
diff --git a/...tc_target/src/spec/x86_64_unknown_uefi.rs → ...t/src/spec/targets/x86_64_unknown_uefi.rs b/...tc_target/src/spec/x86_64_unknown_uefi.rs → ...t/src/spec/targets/x86_64_unknown_uefi.rs
diff --git a/...target/src/spec/x86_64_uwp_windows_gnu.rs → ...rc/spec/targets/x86_64_uwp_windows_gnu.rs b/...target/src/spec/x86_64_uwp_windows_gnu.rs → ...rc/spec/targets/x86_64_uwp_windows_gnu.rs
diff --git a/...arget/src/spec/x86_64_uwp_windows_msvc.rs → ...c/spec/targets/x86_64_uwp_windows_msvc.rs b/...arget/src/spec/x86_64_uwp_windows_msvc.rs → ...c/spec/targets/x86_64_uwp_windows_msvc.rs
diff --git a/...stc_target/src/spec/x86_64_wrs_vxworks.rs → ...et/src/spec/targets/x86_64_wrs_vxworks.rs b/...stc_target/src/spec/x86_64_wrs_vxworks.rs → ...et/src/spec/targets/x86_64_wrs_vxworks.rs
diff --git a/...c_target/src/spec/x86_64h_apple_darwin.rs → .../src/spec/targets/x86_64h_apple_darwin.rs b/...c_target/src/spec/x86_64h_apple_darwin.rs → .../src/spec/targets/x86_64h_apple_darwin.rs
diff --git a/compiler/rustc_target/src/spec/x86_64_fuchsia.rs b/compiler/rustc_target/src/spec/x86_64_fuchsia.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		pub use crate::spec::targets::aarch64_unknown_fuchsia::target;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		pub use crate::spec::targets::x86_64_unknown_fuchsia::target;