From 1af256fe8aea69909e1bf068506a29ebbf82eccf Mon Sep 17 00:00:00 2001 From: David Wood Date: Wed, 8 Nov 2023 14:25:34 +0800 Subject: [PATCH] targets: move target specs to spec/targets Signed-off-by: David Wood --- compiler/rustc_target/src/spec/aarch64_fuchsia.rs | 1 - compiler/rustc_target/src/spec/base/apple/tests.rs | 2 +- compiler/rustc_target/src/spec/mod.rs | 8 +++++--- .../src/spec/{ => targets}/aarch64_apple_darwin.rs | 0 .../src/spec/{ => targets}/aarch64_apple_ios.rs | 0 .../src/spec/{ => targets}/aarch64_apple_ios_macabi.rs | 0 .../src/spec/{ => targets}/aarch64_apple_ios_sim.rs | 0 .../src/spec/{ => targets}/aarch64_apple_tvos.rs | 0 .../src/spec/{ => targets}/aarch64_apple_tvos_sim.rs | 0 .../src/spec/{ => targets}/aarch64_apple_watchos_sim.rs | 0 .../spec/{ => targets}/aarch64_be_unknown_linux_gnu.rs | 0 .../{ => targets}/aarch64_be_unknown_linux_gnu_ilp32.rs | 0 .../src/spec/{ => targets}/aarch64_be_unknown_netbsd.rs | 0 compiler/rustc_target/src/spec/targets/aarch64_fuchsia.rs | 1 + .../src/spec/{ => targets}/aarch64_kmc_solid_asp3.rs | 2 +- .../src/spec/{ => targets}/aarch64_linux_android.rs | 0 .../{ => targets}/aarch64_nintendo_switch_freestanding.rs | 2 +- .../aarch64_nintendo_switch_freestanding_linker_script.ld | 0 .../src/spec/{ => targets}/aarch64_pc_windows_gnullvm.rs | 0 .../src/spec/{ => targets}/aarch64_pc_windows_msvc.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_freebsd.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_fuchsia.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_hermit.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_linux_gnu.rs | 0 .../spec/{ => targets}/aarch64_unknown_linux_gnu_ilp32.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_linux_ohos.rs | 3 +-- .../src/spec/{ => targets}/aarch64_unknown_netbsd.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_none.rs | 2 +- .../spec/{ => targets}/aarch64_unknown_none_softfloat.rs | 2 +- .../src/spec/{ => targets}/aarch64_unknown_nto_qnx_710.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_openbsd.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_redox.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_teeos.rs | 0 .../src/spec/{ => targets}/aarch64_unknown_uefi.rs | 0 .../src/spec/{ => targets}/aarch64_uwp_windows_msvc.rs | 0 .../src/spec/{ => targets}/aarch64_wrs_vxworks.rs | 0 .../src/spec/{ => targets}/arm64_32_apple_watchos.rs | 0 .../src/spec/{ => targets}/arm_linux_androideabi.rs | 0 .../src/spec/{ => targets}/arm_unknown_linux_gnueabi.rs | 0 .../src/spec/{ => targets}/arm_unknown_linux_gnueabihf.rs | 0 .../src/spec/{ => targets}/arm_unknown_linux_musleabi.rs | 0 .../spec/{ => targets}/arm_unknown_linux_musleabihf.rs | 0 .../src/spec/{ => targets}/armeb_unknown_linux_gnueabi.rs | 0 .../src/spec/{ => targets}/armebv7r_none_eabi.rs | 0 .../src/spec/{ => targets}/armebv7r_none_eabihf.rs | 0 .../src/spec/{ => targets}/armv4t_none_eabi.rs | 0 .../spec/{ => targets}/armv4t_unknown_linux_gnueabi.rs | 0 .../src/spec/{ => targets}/armv5te_none_eabi.rs | 0 .../spec/{ => targets}/armv5te_unknown_linux_gnueabi.rs | 0 .../spec/{ => targets}/armv5te_unknown_linux_musleabi.rs | 0 .../{ => targets}/armv5te_unknown_linux_uclibceabi.rs | 0 .../src/spec/{ => targets}/armv6_unknown_freebsd.rs | 0 .../src/spec/{ => targets}/armv6_unknown_netbsd_eabihf.rs | 0 .../src/spec/{ => targets}/armv6k_nintendo_3ds.rs | 0 .../src/spec/{ => targets}/armv7_linux_androideabi.rs | 0 .../spec/{ => targets}/armv7_sony_vita_newlibeabihf.rs | 0 .../src/spec/{ => targets}/armv7_unknown_freebsd.rs | 0 .../src/spec/{ => targets}/armv7_unknown_linux_gnueabi.rs | 0 .../spec/{ => targets}/armv7_unknown_linux_gnueabihf.rs | 0 .../spec/{ => targets}/armv7_unknown_linux_musleabi.rs | 0 .../spec/{ => targets}/armv7_unknown_linux_musleabihf.rs | 0 .../src/spec/{ => targets}/armv7_unknown_linux_ohos.rs | 0 .../spec/{ => targets}/armv7_unknown_linux_uclibceabi.rs | 0 .../{ => targets}/armv7_unknown_linux_uclibceabihf.rs | 0 .../src/spec/{ => targets}/armv7_unknown_netbsd_eabihf.rs | 0 .../src/spec/{ => targets}/armv7_wrs_vxworks_eabihf.rs | 0 .../src/spec/{ => targets}/armv7a_kmc_solid_asp3_eabi.rs | 2 +- .../spec/{ => targets}/armv7a_kmc_solid_asp3_eabihf.rs | 2 +- .../src/spec/{ => targets}/armv7a_none_eabi.rs | 2 +- .../src/spec/{ => targets}/armv7a_none_eabihf.rs | 2 +- .../src/spec/{ => targets}/armv7k_apple_watchos.rs | 0 .../src/spec/{ => targets}/armv7r_none_eabi.rs | 0 .../src/spec/{ => targets}/armv7r_none_eabihf.rs | 0 .../src/spec/{ => targets}/armv7s_apple_ios.rs | 0 .../src/spec/{ => targets}/asmjs_unknown_emscripten.rs | 2 +- .../src/spec/{ => targets}/avr_unknown_gnu_atmega328.rs | 0 .../src/spec/{ => targets}/bpfeb_unknown_none.rs | 0 .../src/spec/{ => targets}/bpfel_unknown_none.rs | 0 .../src/spec/{ => targets}/csky_unknown_linux_gnuabiv2.rs | 0 .../spec/{ => targets}/csky_unknown_linux_gnuabiv2hf.rs | 0 .../src/spec/{ => targets}/hexagon_unknown_linux_musl.rs | 0 .../rustc_target/src/spec/{ => targets}/i386_apple_ios.rs | 0 .../src/spec/{ => targets}/i386_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/i486_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/i586_pc_nto_qnx700.rs | 0 .../src/spec/{ => targets}/i586_pc_windows_msvc.rs | 0 .../src/spec/{ => targets}/i586_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/i586_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/i586_unknown_netbsd.rs | 0 .../src/spec/{ => targets}/i686_apple_darwin.rs | 0 .../src/spec/{ => targets}/i686_linux_android.rs | 0 .../src/spec/{ => targets}/i686_pc_windows_gnu.rs | 0 .../src/spec/{ => targets}/i686_pc_windows_gnullvm.rs | 0 .../src/spec/{ => targets}/i686_pc_windows_msvc.rs | 0 .../src/spec/{ => targets}/i686_unknown_freebsd.rs | 0 .../src/spec/{ => targets}/i686_unknown_haiku.rs | 0 .../src/spec/{ => targets}/i686_unknown_hurd_gnu.rs | 0 .../src/spec/{ => targets}/i686_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/i686_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/i686_unknown_netbsd.rs | 0 .../src/spec/{ => targets}/i686_unknown_openbsd.rs | 0 .../src/spec/{ => targets}/i686_unknown_uefi.rs | 0 .../src/spec/{ => targets}/i686_uwp_windows_gnu.rs | 0 .../src/spec/{ => targets}/i686_uwp_windows_msvc.rs | 0 .../src/spec/{ => targets}/i686_wrs_vxworks.rs | 0 .../spec/{ => targets}/loongarch64_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/loongarch64_unknown_none.rs | 4 ++-- .../{ => targets}/loongarch64_unknown_none_softfloat.rs | 4 ++-- .../src/spec/{ => targets}/m68k_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/mips64_openwrt_linux_musl.rs | 0 .../spec/{ => targets}/mips64_unknown_linux_gnuabi64.rs | 0 .../spec/{ => targets}/mips64_unknown_linux_muslabi64.rs | 0 .../spec/{ => targets}/mips64el_unknown_linux_gnuabi64.rs | 0 .../{ => targets}/mips64el_unknown_linux_muslabi64.rs | 0 .../src/spec/{ => targets}/mips_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/mips_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/mips_unknown_linux_uclibc.rs | 0 .../src/spec/{ => targets}/mipsel_sony_psp.rs | 0 .../spec/{ => targets}/mipsel_sony_psp_linker_script.ld | 0 .../src/spec/{ => targets}/mipsel_sony_psx.rs | 0 .../src/spec/{ => targets}/mipsel_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/mipsel_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/mipsel_unknown_linux_uclibc.rs | 0 .../src/spec/{ => targets}/mipsel_unknown_netbsd.rs | 0 .../src/spec/{ => targets}/mipsel_unknown_none.rs | 0 .../spec/{ => targets}/mipsisa32r6_unknown_linux_gnu.rs | 0 .../spec/{ => targets}/mipsisa32r6el_unknown_linux_gnu.rs | 0 .../{ => targets}/mipsisa64r6_unknown_linux_gnuabi64.rs | 0 .../{ => targets}/mipsisa64r6el_unknown_linux_gnuabi64.rs | 0 .../src/spec/{ => targets}/msp430_none_elf.rs | 0 .../src/spec/{ => targets}/nvptx64_nvidia_cuda.rs | 0 .../src/spec/{ => targets}/powerpc64_ibm_aix.rs | 0 .../src/spec/{ => targets}/powerpc64_unknown_freebsd.rs | 0 .../src/spec/{ => targets}/powerpc64_unknown_linux_gnu.rs | 0 .../spec/{ => targets}/powerpc64_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/powerpc64_unknown_openbsd.rs | 0 .../src/spec/{ => targets}/powerpc64_wrs_vxworks.rs | 0 .../src/spec/{ => targets}/powerpc64le_unknown_freebsd.rs | 0 .../spec/{ => targets}/powerpc64le_unknown_linux_gnu.rs | 0 .../spec/{ => targets}/powerpc64le_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/powerpc_unknown_freebsd.rs | 0 .../src/spec/{ => targets}/powerpc_unknown_linux_gnu.rs | 0 .../spec/{ => targets}/powerpc_unknown_linux_gnuspe.rs | 0 .../src/spec/{ => targets}/powerpc_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/powerpc_unknown_netbsd.rs | 0 .../src/spec/{ => targets}/powerpc_unknown_openbsd.rs | 0 .../src/spec/{ => targets}/powerpc_wrs_vxworks.rs | 0 .../src/spec/{ => targets}/powerpc_wrs_vxworks_spe.rs | 0 .../src/spec/{ => targets}/riscv32gc_unknown_linux_gnu.rs | 0 .../spec/{ => targets}/riscv32gc_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/riscv32i_unknown_none_elf.rs | 0 .../src/spec/{ => targets}/riscv32im_unknown_none_elf.rs | 0 .../src/spec/{ => targets}/riscv32imac_esp_espidf.rs | 0 .../spec/{ => targets}/riscv32imac_unknown_none_elf.rs | 0 .../spec/{ => targets}/riscv32imac_unknown_xous_elf.rs | 0 .../src/spec/{ => targets}/riscv32imc_esp_espidf.rs | 0 .../src/spec/{ => targets}/riscv32imc_unknown_none_elf.rs | 0 .../src/spec/{ => targets}/riscv64_linux_android.rs | 0 .../src/spec/{ => targets}/riscv64gc_unknown_freebsd.rs | 0 .../src/spec/{ => targets}/riscv64gc_unknown_fuchsia.rs | 0 .../src/spec/{ => targets}/riscv64gc_unknown_hermit.rs | 0 .../src/spec/{ => targets}/riscv64gc_unknown_linux_gnu.rs | 0 .../spec/{ => targets}/riscv64gc_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/riscv64gc_unknown_netbsd.rs | 0 .../src/spec/{ => targets}/riscv64gc_unknown_none_elf.rs | 3 +-- .../src/spec/{ => targets}/riscv64gc_unknown_openbsd.rs | 0 .../spec/{ => targets}/riscv64imac_unknown_none_elf.rs | 0 .../src/spec/{ => targets}/s390x_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/s390x_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/sparc64_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/sparc64_unknown_netbsd.rs | 0 .../src/spec/{ => targets}/sparc64_unknown_openbsd.rs | 0 .../src/spec/{ => targets}/sparc_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/sparc_unknown_none_elf.rs | 0 .../src/spec/{ => targets}/sparcv9_sun_solaris.rs | 0 .../src/spec/{ => targets}/thumbv4t_none_eabi.rs | 0 .../src/spec/{ => targets}/thumbv5te_none_eabi.rs | 0 .../src/spec/{ => targets}/thumbv6m_none_eabi.rs | 0 .../src/spec/{ => targets}/thumbv7a_pc_windows_msvc.rs | 0 .../src/spec/{ => targets}/thumbv7a_uwp_windows_msvc.rs | 0 .../src/spec/{ => targets}/thumbv7em_none_eabi.rs | 0 .../src/spec/{ => targets}/thumbv7em_none_eabihf.rs | 0 .../src/spec/{ => targets}/thumbv7m_none_eabi.rs | 0 .../spec/{ => targets}/thumbv7neon_linux_androideabi.rs | 0 .../{ => targets}/thumbv7neon_unknown_linux_gnueabihf.rs | 0 .../{ => targets}/thumbv7neon_unknown_linux_musleabihf.rs | 0 .../src/spec/{ => targets}/thumbv8m_base_none_eabi.rs | 0 .../src/spec/{ => targets}/thumbv8m_main_none_eabi.rs | 0 .../src/spec/{ => targets}/thumbv8m_main_none_eabihf.rs | 0 .../src/spec/{ => targets}/wasm32_unknown_emscripten.rs | 0 .../src/spec/{ => targets}/wasm32_unknown_unknown.rs | 0 .../rustc_target/src/spec/{ => targets}/wasm32_wasi.rs | 0 .../spec/{ => targets}/wasm32_wasi_preview1_threads.rs | 0 .../src/spec/{ => targets}/wasm64_unknown_unknown.rs | 0 .../src/spec/{ => targets}/x86_64_apple_darwin.rs | 0 .../src/spec/{ => targets}/x86_64_apple_ios.rs | 0 .../src/spec/{ => targets}/x86_64_apple_ios_macabi.rs | 0 .../src/spec/{ => targets}/x86_64_apple_tvos.rs | 0 .../src/spec/{ => targets}/x86_64_apple_watchos_sim.rs | 0 .../src/spec/{ => targets}/x86_64_fortanix_unknown_sgx.rs | 2 +- compiler/rustc_target/src/spec/targets/x86_64_fuchsia.rs | 1 + .../src/spec/{ => targets}/x86_64_linux_android.rs | 0 .../src/spec/{ => targets}/x86_64_pc_nto_qnx710.rs | 0 .../src/spec/{ => targets}/x86_64_pc_solaris.rs | 0 .../src/spec/{ => targets}/x86_64_pc_windows_gnu.rs | 0 .../src/spec/{ => targets}/x86_64_pc_windows_gnullvm.rs | 0 .../src/spec/{ => targets}/x86_64_pc_windows_msvc.rs | 0 .../src/spec/{ => targets}/x86_64_sun_solaris.rs | 0 .../src/spec/{ => targets}/x86_64_unikraft_linux_musl.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_dragonfly.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_freebsd.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_fuchsia.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_haiku.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_hermit.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_illumos.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_l4re_uclibc.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_linux_gnu.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_linux_gnux32.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_linux_musl.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_linux_ohos.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_netbsd.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_none.rs | 4 ++-- .../src/spec/{ => targets}/x86_64_unknown_openbsd.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_redox.rs | 0 .../src/spec/{ => targets}/x86_64_unknown_uefi.rs | 0 .../src/spec/{ => targets}/x86_64_uwp_windows_gnu.rs | 0 .../src/spec/{ => targets}/x86_64_uwp_windows_msvc.rs | 0 .../src/spec/{ => targets}/x86_64_wrs_vxworks.rs | 0 .../src/spec/{ => targets}/x86_64h_apple_darwin.rs | 0 compiler/rustc_target/src/spec/x86_64_fuchsia.rs | 1 - 231 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 compiler/rustc_target/src/spec/aarch64_fuchsia.rs rename compiler/rustc_target/src/spec/{ => targets}/aarch64_apple_darwin.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_apple_ios.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_apple_ios_macabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_apple_ios_sim.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_apple_tvos.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_apple_tvos_sim.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_apple_watchos_sim.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_be_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_be_unknown_linux_gnu_ilp32.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_be_unknown_netbsd.rs (100%) create mode 100644 compiler/rustc_target/src/spec/targets/aarch64_fuchsia.rs rename compiler/rustc_target/src/spec/{ => targets}/aarch64_kmc_solid_asp3.rs (90%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_linux_android.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_nintendo_switch_freestanding.rs (91%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_nintendo_switch_freestanding_linker_script.ld (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_pc_windows_gnullvm.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_pc_windows_msvc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_freebsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_fuchsia.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_hermit.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_linux_gnu_ilp32.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_linux_ohos.rs (96%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_netbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_none.rs (98%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_none_softfloat.rs (91%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_nto_qnx_710.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_openbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_redox.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_teeos.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_uefi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_uwp_windows_msvc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_wrs_vxworks.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/arm64_32_apple_watchos.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/arm_linux_androideabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/arm_unknown_linux_gnueabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/arm_unknown_linux_gnueabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/arm_unknown_linux_musleabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/arm_unknown_linux_musleabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armeb_unknown_linux_gnueabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armebv7r_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armebv7r_none_eabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv4t_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv4t_unknown_linux_gnueabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv5te_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv5te_unknown_linux_gnueabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv5te_unknown_linux_musleabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv5te_unknown_linux_uclibceabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv6_unknown_freebsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv6_unknown_netbsd_eabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv6k_nintendo_3ds.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_linux_androideabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_sony_vita_newlibeabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_unknown_freebsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_unknown_linux_gnueabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_unknown_linux_gnueabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_unknown_linux_musleabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_unknown_linux_musleabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_unknown_linux_ohos.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_unknown_linux_uclibceabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_unknown_linux_uclibceabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_unknown_netbsd_eabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7_wrs_vxworks_eabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7a_kmc_solid_asp3_eabi.rs (90%) rename compiler/rustc_target/src/spec/{ => targets}/armv7a_kmc_solid_asp3_eabihf.rs (90%) rename compiler/rustc_target/src/spec/{ => targets}/armv7a_none_eabi.rs (94%) rename compiler/rustc_target/src/spec/{ => targets}/armv7a_none_eabihf.rs (92%) rename compiler/rustc_target/src/spec/{ => targets}/armv7k_apple_watchos.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7r_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7r_none_eabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/armv7s_apple_ios.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/asmjs_unknown_emscripten.rs (71%) rename compiler/rustc_target/src/spec/{ => targets}/avr_unknown_gnu_atmega328.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/bpfeb_unknown_none.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/bpfel_unknown_none.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/csky_unknown_linux_gnuabiv2.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/csky_unknown_linux_gnuabiv2hf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/hexagon_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i386_apple_ios.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i386_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i486_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i586_pc_nto_qnx700.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i586_pc_windows_msvc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i586_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i586_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i586_unknown_netbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_apple_darwin.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_linux_android.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_pc_windows_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_pc_windows_gnullvm.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_pc_windows_msvc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_unknown_freebsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_unknown_haiku.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_unknown_hurd_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_unknown_netbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_unknown_openbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_unknown_uefi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_uwp_windows_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_uwp_windows_msvc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/i686_wrs_vxworks.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/loongarch64_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/loongarch64_unknown_none.rs (85%) rename compiler/rustc_target/src/spec/{ => targets}/loongarch64_unknown_none_softfloat.rs (86%) rename compiler/rustc_target/src/spec/{ => targets}/m68k_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mips64_openwrt_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mips64_unknown_linux_gnuabi64.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mips64_unknown_linux_muslabi64.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mips64el_unknown_linux_gnuabi64.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mips64el_unknown_linux_muslabi64.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mips_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mips_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mips_unknown_linux_uclibc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsel_sony_psp.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsel_sony_psp_linker_script.ld (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsel_sony_psx.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsel_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsel_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsel_unknown_linux_uclibc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsel_unknown_netbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsel_unknown_none.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsisa32r6_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsisa32r6el_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsisa64r6_unknown_linux_gnuabi64.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/mipsisa64r6el_unknown_linux_gnuabi64.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/msp430_none_elf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/nvptx64_nvidia_cuda.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc64_ibm_aix.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc64_unknown_freebsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc64_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc64_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc64_unknown_openbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc64_wrs_vxworks.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc64le_unknown_freebsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc64le_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc64le_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc_unknown_freebsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc_unknown_linux_gnuspe.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc_unknown_netbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc_unknown_openbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc_wrs_vxworks.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/powerpc_wrs_vxworks_spe.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv32gc_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv32gc_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv32i_unknown_none_elf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv32im_unknown_none_elf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv32imac_esp_espidf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv32imac_unknown_none_elf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv32imac_unknown_xous_elf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv32imc_esp_espidf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv32imc_unknown_none_elf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv64_linux_android.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv64gc_unknown_freebsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv64gc_unknown_fuchsia.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv64gc_unknown_hermit.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv64gc_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv64gc_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv64gc_unknown_netbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv64gc_unknown_none_elf.rs (96%) rename compiler/rustc_target/src/spec/{ => targets}/riscv64gc_unknown_openbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/riscv64imac_unknown_none_elf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/s390x_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/s390x_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/sparc64_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/sparc64_unknown_netbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/sparc64_unknown_openbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/sparc_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/sparc_unknown_none_elf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/sparcv9_sun_solaris.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv4t_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv5te_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv6m_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv7a_pc_windows_msvc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv7a_uwp_windows_msvc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv7em_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv7em_none_eabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv7m_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv7neon_linux_androideabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv7neon_unknown_linux_gnueabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv7neon_unknown_linux_musleabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv8m_base_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv8m_main_none_eabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/thumbv8m_main_none_eabihf.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/wasm32_unknown_emscripten.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/wasm32_unknown_unknown.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/wasm32_wasi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/wasm32_wasi_preview1_threads.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/wasm64_unknown_unknown.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_apple_darwin.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_apple_ios.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_apple_ios_macabi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_apple_tvos.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_apple_watchos_sim.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_fortanix_unknown_sgx.rs (97%) create mode 100644 compiler/rustc_target/src/spec/targets/x86_64_fuchsia.rs rename compiler/rustc_target/src/spec/{ => targets}/x86_64_linux_android.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_pc_nto_qnx710.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_pc_solaris.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_pc_windows_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_pc_windows_gnullvm.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_pc_windows_msvc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_sun_solaris.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unikraft_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_dragonfly.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_freebsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_fuchsia.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_haiku.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_hermit.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_illumos.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_l4re_uclibc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_linux_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_linux_gnux32.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_linux_musl.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_linux_ohos.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_netbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_none.rs (89%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_openbsd.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_redox.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_unknown_uefi.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_uwp_windows_gnu.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_uwp_windows_msvc.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64_wrs_vxworks.rs (100%) rename compiler/rustc_target/src/spec/{ => targets}/x86_64h_apple_darwin.rs (100%) delete mode 100644 compiler/rustc_target/src/spec/x86_64_fuchsia.rs diff --git a/compiler/rustc_target/src/spec/aarch64_fuchsia.rs b/compiler/rustc_target/src/spec/aarch64_fuchsia.rs deleted file mode 100644 index ddecbb1a8c4a4..0000000000000 --- a/compiler/rustc_target/src/spec/aarch64_fuchsia.rs +++ /dev/null @@ -1 +0,0 @@ -pub use crate::spec::aarch64_unknown_fuchsia::target; diff --git a/compiler/rustc_target/src/spec/base/apple/tests.rs b/compiler/rustc_target/src/spec/base/apple/tests.rs index 3b23ddadcc47c..f13058ebc82ad 100644 --- 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 index f569584c20b6c..f04799482c831 100644 --- 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 { 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/compiler/rustc_target/src/spec/aarch64_apple_darwin.rs b/compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_apple_darwin.rs rename to compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs diff --git a/compiler/rustc_target/src/spec/aarch64_apple_ios.rs b/compiler/rustc_target/src/spec/targets/aarch64_apple_ios.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_apple_ios.rs rename to compiler/rustc_target/src/spec/targets/aarch64_apple_ios.rs diff --git a/compiler/rustc_target/src/spec/aarch64_apple_ios_macabi.rs b/compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_apple_ios_macabi.rs rename to compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs diff --git a/compiler/rustc_target/src/spec/aarch64_apple_ios_sim.rs b/compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_apple_ios_sim.rs rename to compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs diff --git a/compiler/rustc_target/src/spec/aarch64_apple_tvos.rs b/compiler/rustc_target/src/spec/targets/aarch64_apple_tvos.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_apple_tvos.rs rename to compiler/rustc_target/src/spec/targets/aarch64_apple_tvos.rs diff --git a/compiler/rustc_target/src/spec/aarch64_apple_tvos_sim.rs b/compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_apple_tvos_sim.rs rename to compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs diff --git a/compiler/rustc_target/src/spec/aarch64_apple_watchos_sim.rs b/compiler/rustc_target/src/spec/targets/aarch64_apple_watchos_sim.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_apple_watchos_sim.rs rename to compiler/rustc_target/src/spec/targets/aarch64_apple_watchos_sim.rs diff --git a/compiler/rustc_target/src/spec/aarch64_be_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/aarch64_be_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_be_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/aarch64_be_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/aarch64_be_unknown_linux_gnu_ilp32.rs b/compiler/rustc_target/src/spec/targets/aarch64_be_unknown_linux_gnu_ilp32.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_be_unknown_linux_gnu_ilp32.rs rename to compiler/rustc_target/src/spec/targets/aarch64_be_unknown_linux_gnu_ilp32.rs diff --git a/compiler/rustc_target/src/spec/aarch64_be_unknown_netbsd.rs b/compiler/rustc_target/src/spec/targets/aarch64_be_unknown_netbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_be_unknown_netbsd.rs rename to compiler/rustc_target/src/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 new file mode 100644 index 0000000000000..3668db912bb81 --- /dev/null +++ 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/compiler/rustc_target/src/spec/aarch64_kmc_solid_asp3.rs b/compiler/rustc_target/src/spec/targets/aarch64_kmc_solid_asp3.rs similarity index 90% rename from compiler/rustc_target/src/spec/aarch64_kmc_solid_asp3.rs rename to compiler/rustc_target/src/spec/targets/aarch64_kmc_solid_asp3.rs index f72a6c1056f26..e5e22fd1ee28f 100644 --- a/compiler/rustc_target/src/spec/aarch64_kmc_solid_asp3.rs +++ b/compiler/rustc_target/src/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/compiler/rustc_target/src/spec/aarch64_linux_android.rs b/compiler/rustc_target/src/spec/targets/aarch64_linux_android.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_linux_android.rs rename to compiler/rustc_target/src/spec/targets/aarch64_linux_android.rs diff --git a/compiler/rustc_target/src/spec/aarch64_nintendo_switch_freestanding.rs b/compiler/rustc_target/src/spec/targets/aarch64_nintendo_switch_freestanding.rs similarity index 91% rename from compiler/rustc_target/src/spec/aarch64_nintendo_switch_freestanding.rs rename to compiler/rustc_target/src/spec/targets/aarch64_nintendo_switch_freestanding.rs index e271bdc8a015b..02fcc2bb43e9a 100644 --- a/compiler/rustc_target/src/spec/aarch64_nintendo_switch_freestanding.rs +++ b/compiler/rustc_target/src/spec/targets/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/compiler/rustc_target/src/spec/aarch64_nintendo_switch_freestanding_linker_script.ld b/compiler/rustc_target/src/spec/targets/aarch64_nintendo_switch_freestanding_linker_script.ld similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_nintendo_switch_freestanding_linker_script.ld rename to compiler/rustc_target/src/spec/targets/aarch64_nintendo_switch_freestanding_linker_script.ld diff --git a/compiler/rustc_target/src/spec/aarch64_pc_windows_gnullvm.rs b/compiler/rustc_target/src/spec/targets/aarch64_pc_windows_gnullvm.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_pc_windows_gnullvm.rs rename to compiler/rustc_target/src/spec/targets/aarch64_pc_windows_gnullvm.rs diff --git a/compiler/rustc_target/src/spec/aarch64_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/aarch64_pc_windows_msvc.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_pc_windows_msvc.rs rename to compiler/rustc_target/src/spec/targets/aarch64_pc_windows_msvc.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_freebsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_freebsd.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_freebsd.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_fuchsia.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_fuchsia.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_fuchsia.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_fuchsia.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_hermit.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_hermit.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu_ilp32.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_gnu_ilp32.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu_ilp32.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_gnu_ilp32.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_linux_ohos.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_ohos.rs similarity index 96% rename from compiler/rustc_target/src/spec/aarch64_unknown_linux_ohos.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_ohos.rs index 3698693a54aae..5f3bef63aa653 100644 --- a/compiler/rustc_target/src/spec/aarch64_unknown_linux_ohos.rs +++ b/compiler/rustc_target/src/spec/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/compiler/rustc_target/src/spec/aarch64_unknown_netbsd.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_netbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_netbsd.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_netbsd.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none.rs similarity index 98% rename from compiler/rustc_target/src/spec/aarch64_unknown_none.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_none.rs index be27302f7f52c..88fa6d5a762f0 100644 --- a/compiler/rustc_target/src/spec/aarch64_unknown_none.rs +++ b/compiler/rustc_target/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/compiler/rustc_target/src/spec/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs similarity index 91% rename from compiler/rustc_target/src/spec/aarch64_unknown_none_softfloat.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs index 9dfa1f268ac51..48b79b0b9bace 100644 --- a/compiler/rustc_target/src/spec/aarch64_unknown_none_softfloat.rs +++ b/compiler/rustc_target/src/spec/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/compiler/rustc_target/src/spec/aarch64_unknown_nto_qnx_710.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_nto_qnx_710.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_nto_qnx_710.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_nto_qnx_710.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_openbsd.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_openbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_openbsd.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_openbsd.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_redox.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_redox.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_redox.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_redox.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_teeos.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_teeos.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_teeos.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_teeos.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_unknown_uefi.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs diff --git a/compiler/rustc_target/src/spec/aarch64_uwp_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/aarch64_uwp_windows_msvc.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_uwp_windows_msvc.rs rename to compiler/rustc_target/src/spec/targets/aarch64_uwp_windows_msvc.rs diff --git a/compiler/rustc_target/src/spec/aarch64_wrs_vxworks.rs b/compiler/rustc_target/src/spec/targets/aarch64_wrs_vxworks.rs similarity index 100% rename from compiler/rustc_target/src/spec/aarch64_wrs_vxworks.rs rename to compiler/rustc_target/src/spec/targets/aarch64_wrs_vxworks.rs diff --git a/compiler/rustc_target/src/spec/arm64_32_apple_watchos.rs b/compiler/rustc_target/src/spec/targets/arm64_32_apple_watchos.rs similarity index 100% rename from compiler/rustc_target/src/spec/arm64_32_apple_watchos.rs rename to compiler/rustc_target/src/spec/targets/arm64_32_apple_watchos.rs diff --git a/compiler/rustc_target/src/spec/arm_linux_androideabi.rs b/compiler/rustc_target/src/spec/targets/arm_linux_androideabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/arm_linux_androideabi.rs rename to compiler/rustc_target/src/spec/targets/arm_linux_androideabi.rs diff --git a/compiler/rustc_target/src/spec/arm_unknown_linux_gnueabi.rs b/compiler/rustc_target/src/spec/targets/arm_unknown_linux_gnueabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/arm_unknown_linux_gnueabi.rs rename to compiler/rustc_target/src/spec/targets/arm_unknown_linux_gnueabi.rs diff --git a/compiler/rustc_target/src/spec/arm_unknown_linux_gnueabihf.rs b/compiler/rustc_target/src/spec/targets/arm_unknown_linux_gnueabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/arm_unknown_linux_gnueabihf.rs rename to compiler/rustc_target/src/spec/targets/arm_unknown_linux_gnueabihf.rs diff --git a/compiler/rustc_target/src/spec/arm_unknown_linux_musleabi.rs b/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/arm_unknown_linux_musleabi.rs rename to compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabi.rs diff --git a/compiler/rustc_target/src/spec/arm_unknown_linux_musleabihf.rs b/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/arm_unknown_linux_musleabihf.rs rename to compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabihf.rs diff --git a/compiler/rustc_target/src/spec/armeb_unknown_linux_gnueabi.rs b/compiler/rustc_target/src/spec/targets/armeb_unknown_linux_gnueabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armeb_unknown_linux_gnueabi.rs rename to compiler/rustc_target/src/spec/targets/armeb_unknown_linux_gnueabi.rs diff --git a/compiler/rustc_target/src/spec/armebv7r_none_eabi.rs b/compiler/rustc_target/src/spec/targets/armebv7r_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armebv7r_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/armebv7r_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/armebv7r_none_eabihf.rs b/compiler/rustc_target/src/spec/targets/armebv7r_none_eabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/armebv7r_none_eabihf.rs rename to compiler/rustc_target/src/spec/targets/armebv7r_none_eabihf.rs diff --git a/compiler/rustc_target/src/spec/armv4t_none_eabi.rs b/compiler/rustc_target/src/spec/targets/armv4t_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv4t_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/armv4t_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/armv4t_unknown_linux_gnueabi.rs b/compiler/rustc_target/src/spec/targets/armv4t_unknown_linux_gnueabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv4t_unknown_linux_gnueabi.rs rename to compiler/rustc_target/src/spec/targets/armv4t_unknown_linux_gnueabi.rs diff --git a/compiler/rustc_target/src/spec/armv5te_none_eabi.rs b/compiler/rustc_target/src/spec/targets/armv5te_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv5te_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/armv5te_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/armv5te_unknown_linux_gnueabi.rs b/compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_gnueabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv5te_unknown_linux_gnueabi.rs rename to compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_gnueabi.rs diff --git a/compiler/rustc_target/src/spec/armv5te_unknown_linux_musleabi.rs b/compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_musleabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv5te_unknown_linux_musleabi.rs rename to compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_musleabi.rs diff --git a/compiler/rustc_target/src/spec/armv5te_unknown_linux_uclibceabi.rs b/compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_uclibceabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv5te_unknown_linux_uclibceabi.rs rename to compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_uclibceabi.rs diff --git a/compiler/rustc_target/src/spec/armv6_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/armv6_unknown_freebsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv6_unknown_freebsd.rs rename to compiler/rustc_target/src/spec/targets/armv6_unknown_freebsd.rs diff --git a/compiler/rustc_target/src/spec/armv6_unknown_netbsd_eabihf.rs b/compiler/rustc_target/src/spec/targets/armv6_unknown_netbsd_eabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv6_unknown_netbsd_eabihf.rs rename to compiler/rustc_target/src/spec/targets/armv6_unknown_netbsd_eabihf.rs diff --git a/compiler/rustc_target/src/spec/armv6k_nintendo_3ds.rs b/compiler/rustc_target/src/spec/targets/armv6k_nintendo_3ds.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv6k_nintendo_3ds.rs rename to compiler/rustc_target/src/spec/targets/armv6k_nintendo_3ds.rs diff --git a/compiler/rustc_target/src/spec/armv7_linux_androideabi.rs b/compiler/rustc_target/src/spec/targets/armv7_linux_androideabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_linux_androideabi.rs rename to compiler/rustc_target/src/spec/targets/armv7_linux_androideabi.rs diff --git a/compiler/rustc_target/src/spec/armv7_sony_vita_newlibeabihf.rs b/compiler/rustc_target/src/spec/targets/armv7_sony_vita_newlibeabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_sony_vita_newlibeabihf.rs rename to compiler/rustc_target/src/spec/targets/armv7_sony_vita_newlibeabihf.rs diff --git a/compiler/rustc_target/src/spec/armv7_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_freebsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_unknown_freebsd.rs rename to compiler/rustc_target/src/spec/targets/armv7_unknown_freebsd.rs diff --git a/compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabi.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_gnueabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabi.rs rename to compiler/rustc_target/src/spec/targets/armv7_unknown_linux_gnueabi.rs diff --git a/compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabihf.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_gnueabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabihf.rs rename to compiler/rustc_target/src/spec/targets/armv7_unknown_linux_gnueabihf.rs diff --git a/compiler/rustc_target/src/spec/armv7_unknown_linux_musleabi.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_unknown_linux_musleabi.rs rename to compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabi.rs diff --git a/compiler/rustc_target/src/spec/armv7_unknown_linux_musleabihf.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_unknown_linux_musleabihf.rs rename to compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabihf.rs diff --git a/compiler/rustc_target/src/spec/armv7_unknown_linux_ohos.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_ohos.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_unknown_linux_ohos.rs rename to compiler/rustc_target/src/spec/targets/armv7_unknown_linux_ohos.rs diff --git a/compiler/rustc_target/src/spec/armv7_unknown_linux_uclibceabi.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_uclibceabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_unknown_linux_uclibceabi.rs rename to compiler/rustc_target/src/spec/targets/armv7_unknown_linux_uclibceabi.rs diff --git a/compiler/rustc_target/src/spec/armv7_unknown_linux_uclibceabihf.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_uclibceabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_unknown_linux_uclibceabihf.rs rename to compiler/rustc_target/src/spec/targets/armv7_unknown_linux_uclibceabihf.rs diff --git a/compiler/rustc_target/src/spec/armv7_unknown_netbsd_eabihf.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_netbsd_eabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_unknown_netbsd_eabihf.rs rename to compiler/rustc_target/src/spec/targets/armv7_unknown_netbsd_eabihf.rs diff --git a/compiler/rustc_target/src/spec/armv7_wrs_vxworks_eabihf.rs b/compiler/rustc_target/src/spec/targets/armv7_wrs_vxworks_eabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7_wrs_vxworks_eabihf.rs rename to compiler/rustc_target/src/spec/targets/armv7_wrs_vxworks_eabihf.rs diff --git a/compiler/rustc_target/src/spec/armv7a_kmc_solid_asp3_eabi.rs b/compiler/rustc_target/src/spec/targets/armv7a_kmc_solid_asp3_eabi.rs similarity index 90% rename from compiler/rustc_target/src/spec/armv7a_kmc_solid_asp3_eabi.rs rename to compiler/rustc_target/src/spec/targets/armv7a_kmc_solid_asp3_eabi.rs index 68c6aa9efc676..57d40d54c449d 100644 --- a/compiler/rustc_target/src/spec/armv7a_kmc_solid_asp3_eabi.rs +++ b/compiler/rustc_target/src/spec/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/compiler/rustc_target/src/spec/armv7a_kmc_solid_asp3_eabihf.rs b/compiler/rustc_target/src/spec/targets/armv7a_kmc_solid_asp3_eabihf.rs similarity index 90% rename from compiler/rustc_target/src/spec/armv7a_kmc_solid_asp3_eabihf.rs rename to compiler/rustc_target/src/spec/targets/armv7a_kmc_solid_asp3_eabihf.rs index 04e45699cfc49..3d21213c5ff8f 100644 --- a/compiler/rustc_target/src/spec/armv7a_kmc_solid_asp3_eabihf.rs +++ b/compiler/rustc_target/src/spec/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/compiler/rustc_target/src/spec/armv7a_none_eabi.rs b/compiler/rustc_target/src/spec/targets/armv7a_none_eabi.rs similarity index 94% rename from compiler/rustc_target/src/spec/armv7a_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/armv7a_none_eabi.rs index d59de86a23012..c5b61427e6982 100644 --- a/compiler/rustc_target/src/spec/armv7a_none_eabi.rs +++ b/compiler/rustc_target/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/compiler/rustc_target/src/spec/armv7a_none_eabihf.rs b/compiler/rustc_target/src/spec/targets/armv7a_none_eabihf.rs similarity index 92% rename from compiler/rustc_target/src/spec/armv7a_none_eabihf.rs rename to compiler/rustc_target/src/spec/targets/armv7a_none_eabihf.rs index c134f3e090781..ba3caad6a9729 100644 --- a/compiler/rustc_target/src/spec/armv7a_none_eabihf.rs +++ b/compiler/rustc_target/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/compiler/rustc_target/src/spec/armv7k_apple_watchos.rs b/compiler/rustc_target/src/spec/targets/armv7k_apple_watchos.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7k_apple_watchos.rs rename to compiler/rustc_target/src/spec/targets/armv7k_apple_watchos.rs diff --git a/compiler/rustc_target/src/spec/armv7r_none_eabi.rs b/compiler/rustc_target/src/spec/targets/armv7r_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7r_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/armv7r_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/armv7r_none_eabihf.rs b/compiler/rustc_target/src/spec/targets/armv7r_none_eabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7r_none_eabihf.rs rename to compiler/rustc_target/src/spec/targets/armv7r_none_eabihf.rs diff --git a/compiler/rustc_target/src/spec/armv7s_apple_ios.rs b/compiler/rustc_target/src/spec/targets/armv7s_apple_ios.rs similarity index 100% rename from compiler/rustc_target/src/spec/armv7s_apple_ios.rs rename to compiler/rustc_target/src/spec/targets/armv7s_apple_ios.rs diff --git a/compiler/rustc_target/src/spec/asmjs_unknown_emscripten.rs b/compiler/rustc_target/src/spec/targets/asmjs_unknown_emscripten.rs similarity index 71% rename from compiler/rustc_target/src/spec/asmjs_unknown_emscripten.rs rename to compiler/rustc_target/src/spec/targets/asmjs_unknown_emscripten.rs index f492c3451a418..e4768c67af55e 100644 --- a/compiler/rustc_target/src/spec/asmjs_unknown_emscripten.rs +++ b/compiler/rustc_target/src/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/compiler/rustc_target/src/spec/avr_unknown_gnu_atmega328.rs b/compiler/rustc_target/src/spec/targets/avr_unknown_gnu_atmega328.rs similarity index 100% rename from compiler/rustc_target/src/spec/avr_unknown_gnu_atmega328.rs rename to compiler/rustc_target/src/spec/targets/avr_unknown_gnu_atmega328.rs diff --git a/compiler/rustc_target/src/spec/bpfeb_unknown_none.rs b/compiler/rustc_target/src/spec/targets/bpfeb_unknown_none.rs similarity index 100% rename from compiler/rustc_target/src/spec/bpfeb_unknown_none.rs rename to compiler/rustc_target/src/spec/targets/bpfeb_unknown_none.rs diff --git a/compiler/rustc_target/src/spec/bpfel_unknown_none.rs b/compiler/rustc_target/src/spec/targets/bpfel_unknown_none.rs similarity index 100% rename from compiler/rustc_target/src/spec/bpfel_unknown_none.rs rename to compiler/rustc_target/src/spec/targets/bpfel_unknown_none.rs diff --git a/compiler/rustc_target/src/spec/csky_unknown_linux_gnuabiv2.rs b/compiler/rustc_target/src/spec/targets/csky_unknown_linux_gnuabiv2.rs similarity index 100% rename from compiler/rustc_target/src/spec/csky_unknown_linux_gnuabiv2.rs rename to compiler/rustc_target/src/spec/targets/csky_unknown_linux_gnuabiv2.rs diff --git a/compiler/rustc_target/src/spec/csky_unknown_linux_gnuabiv2hf.rs b/compiler/rustc_target/src/spec/targets/csky_unknown_linux_gnuabiv2hf.rs similarity index 100% rename from compiler/rustc_target/src/spec/csky_unknown_linux_gnuabiv2hf.rs rename to compiler/rustc_target/src/spec/targets/csky_unknown_linux_gnuabiv2hf.rs diff --git a/compiler/rustc_target/src/spec/hexagon_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/hexagon_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/hexagon_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/hexagon_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/i386_apple_ios.rs b/compiler/rustc_target/src/spec/targets/i386_apple_ios.rs similarity index 100% rename from compiler/rustc_target/src/spec/i386_apple_ios.rs rename to compiler/rustc_target/src/spec/targets/i386_apple_ios.rs diff --git a/compiler/rustc_target/src/spec/i386_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/i386_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/i386_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/i386_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/i486_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/i486_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/i486_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/i486_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/i586_pc_nto_qnx700.rs b/compiler/rustc_target/src/spec/targets/i586_pc_nto_qnx700.rs similarity index 100% rename from compiler/rustc_target/src/spec/i586_pc_nto_qnx700.rs rename to compiler/rustc_target/src/spec/targets/i586_pc_nto_qnx700.rs diff --git a/compiler/rustc_target/src/spec/i586_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/i586_pc_windows_msvc.rs similarity index 100% rename from compiler/rustc_target/src/spec/i586_pc_windows_msvc.rs rename to compiler/rustc_target/src/spec/targets/i586_pc_windows_msvc.rs diff --git a/compiler/rustc_target/src/spec/i586_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/i586_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/i586_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/i586_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/i586_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/i586_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/i586_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/i586_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/i586_unknown_netbsd.rs b/compiler/rustc_target/src/spec/targets/i586_unknown_netbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/i586_unknown_netbsd.rs rename to compiler/rustc_target/src/spec/targets/i586_unknown_netbsd.rs diff --git a/compiler/rustc_target/src/spec/i686_apple_darwin.rs b/compiler/rustc_target/src/spec/targets/i686_apple_darwin.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_apple_darwin.rs rename to compiler/rustc_target/src/spec/targets/i686_apple_darwin.rs diff --git a/compiler/rustc_target/src/spec/i686_linux_android.rs b/compiler/rustc_target/src/spec/targets/i686_linux_android.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_linux_android.rs rename to compiler/rustc_target/src/spec/targets/i686_linux_android.rs diff --git a/compiler/rustc_target/src/spec/i686_pc_windows_gnu.rs b/compiler/rustc_target/src/spec/targets/i686_pc_windows_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_pc_windows_gnu.rs rename to compiler/rustc_target/src/spec/targets/i686_pc_windows_gnu.rs diff --git a/compiler/rustc_target/src/spec/i686_pc_windows_gnullvm.rs b/compiler/rustc_target/src/spec/targets/i686_pc_windows_gnullvm.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_pc_windows_gnullvm.rs rename to compiler/rustc_target/src/spec/targets/i686_pc_windows_gnullvm.rs diff --git a/compiler/rustc_target/src/spec/i686_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/i686_pc_windows_msvc.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_pc_windows_msvc.rs rename to compiler/rustc_target/src/spec/targets/i686_pc_windows_msvc.rs diff --git a/compiler/rustc_target/src/spec/i686_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_unknown_freebsd.rs rename to compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs diff --git a/compiler/rustc_target/src/spec/i686_unknown_haiku.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_haiku.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_unknown_haiku.rs rename to compiler/rustc_target/src/spec/targets/i686_unknown_haiku.rs diff --git a/compiler/rustc_target/src/spec/i686_unknown_hurd_gnu.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_hurd_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_unknown_hurd_gnu.rs rename to compiler/rustc_target/src/spec/targets/i686_unknown_hurd_gnu.rs diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/i686_unknown_netbsd.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_netbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_unknown_netbsd.rs rename to compiler/rustc_target/src/spec/targets/i686_unknown_netbsd.rs diff --git a/compiler/rustc_target/src/spec/i686_unknown_openbsd.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_openbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_unknown_openbsd.rs rename to compiler/rustc_target/src/spec/targets/i686_unknown_openbsd.rs diff --git a/compiler/rustc_target/src/spec/i686_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_uefi.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_unknown_uefi.rs rename to compiler/rustc_target/src/spec/targets/i686_unknown_uefi.rs diff --git a/compiler/rustc_target/src/spec/i686_uwp_windows_gnu.rs b/compiler/rustc_target/src/spec/targets/i686_uwp_windows_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_uwp_windows_gnu.rs rename to compiler/rustc_target/src/spec/targets/i686_uwp_windows_gnu.rs diff --git a/compiler/rustc_target/src/spec/i686_uwp_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/i686_uwp_windows_msvc.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_uwp_windows_msvc.rs rename to compiler/rustc_target/src/spec/targets/i686_uwp_windows_msvc.rs diff --git a/compiler/rustc_target/src/spec/i686_wrs_vxworks.rs b/compiler/rustc_target/src/spec/targets/i686_wrs_vxworks.rs similarity index 100% rename from compiler/rustc_target/src/spec/i686_wrs_vxworks.rs rename to compiler/rustc_target/src/spec/targets/i686_wrs_vxworks.rs diff --git a/compiler/rustc_target/src/spec/loongarch64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/loongarch64_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/loongarch64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/loongarch64_unknown_none.rs similarity index 85% rename from compiler/rustc_target/src/spec/loongarch64_unknown_none.rs rename to compiler/rustc_target/src/spec/targets/loongarch64_unknown_none.rs index dbc96d68eae17..3b1ea8e206f1c 100644 --- a/compiler/rustc_target/src/spec/loongarch64_unknown_none.rs +++ b/compiler/rustc_target/src/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/compiler/rustc_target/src/spec/loongarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/loongarch64_unknown_none_softfloat.rs similarity index 86% rename from compiler/rustc_target/src/spec/loongarch64_unknown_none_softfloat.rs rename to compiler/rustc_target/src/spec/targets/loongarch64_unknown_none_softfloat.rs index c4d5c7bc44ccd..ab9300ef9c723 100644 --- a/compiler/rustc_target/src/spec/loongarch64_unknown_none_softfloat.rs +++ b/compiler/rustc_target/src/spec/targets/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/compiler/rustc_target/src/spec/m68k_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/m68k_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/m68k_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/m68k_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/mips64_openwrt_linux_musl.rs b/compiler/rustc_target/src/spec/targets/mips64_openwrt_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/mips64_openwrt_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/mips64_openwrt_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs b/compiler/rustc_target/src/spec/targets/mips64_unknown_linux_gnuabi64.rs similarity index 100% rename from compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs rename to compiler/rustc_target/src/spec/targets/mips64_unknown_linux_gnuabi64.rs diff --git a/compiler/rustc_target/src/spec/mips64_unknown_linux_muslabi64.rs b/compiler/rustc_target/src/spec/targets/mips64_unknown_linux_muslabi64.rs similarity index 100% rename from compiler/rustc_target/src/spec/mips64_unknown_linux_muslabi64.rs rename to compiler/rustc_target/src/spec/targets/mips64_unknown_linux_muslabi64.rs diff --git a/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs b/compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_gnuabi64.rs similarity index 100% rename from compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs rename to compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_gnuabi64.rs diff --git a/compiler/rustc_target/src/spec/mips64el_unknown_linux_muslabi64.rs b/compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_muslabi64.rs similarity index 100% rename from compiler/rustc_target/src/spec/mips64el_unknown_linux_muslabi64.rs rename to compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_muslabi64.rs diff --git a/compiler/rustc_target/src/spec/mips_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/mips_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/mips_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/mips_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/mips_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/mips_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/mips_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/mips_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/mips_unknown_linux_uclibc.rs b/compiler/rustc_target/src/spec/targets/mips_unknown_linux_uclibc.rs similarity index 100% rename from compiler/rustc_target/src/spec/mips_unknown_linux_uclibc.rs rename to compiler/rustc_target/src/spec/targets/mips_unknown_linux_uclibc.rs diff --git a/compiler/rustc_target/src/spec/mipsel_sony_psp.rs b/compiler/rustc_target/src/spec/targets/mipsel_sony_psp.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsel_sony_psp.rs rename to compiler/rustc_target/src/spec/targets/mipsel_sony_psp.rs diff --git a/compiler/rustc_target/src/spec/mipsel_sony_psp_linker_script.ld b/compiler/rustc_target/src/spec/targets/mipsel_sony_psp_linker_script.ld similarity index 100% rename from compiler/rustc_target/src/spec/mipsel_sony_psp_linker_script.ld rename to compiler/rustc_target/src/spec/targets/mipsel_sony_psp_linker_script.ld diff --git a/compiler/rustc_target/src/spec/mipsel_sony_psx.rs b/compiler/rustc_target/src/spec/targets/mipsel_sony_psx.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsel_sony_psx.rs rename to compiler/rustc_target/src/spec/targets/mipsel_sony_psx.rs diff --git a/compiler/rustc_target/src/spec/mipsel_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsel_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/mipsel_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsel_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/mipsel_unknown_linux_uclibc.rs b/compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_uclibc.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsel_unknown_linux_uclibc.rs rename to compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_uclibc.rs diff --git a/compiler/rustc_target/src/spec/mipsel_unknown_netbsd.rs b/compiler/rustc_target/src/spec/targets/mipsel_unknown_netbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsel_unknown_netbsd.rs rename to compiler/rustc_target/src/spec/targets/mipsel_unknown_netbsd.rs diff --git a/compiler/rustc_target/src/spec/mipsel_unknown_none.rs b/compiler/rustc_target/src/spec/targets/mipsel_unknown_none.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsel_unknown_none.rs rename to compiler/rustc_target/src/spec/targets/mipsel_unknown_none.rs diff --git a/compiler/rustc_target/src/spec/mipsisa32r6_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/mipsisa32r6_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsisa32r6_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/mipsisa32r6_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/mipsisa32r6el_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/mipsisa32r6el_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsisa32r6el_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/mipsisa32r6el_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/mipsisa64r6_unknown_linux_gnuabi64.rs b/compiler/rustc_target/src/spec/targets/mipsisa64r6_unknown_linux_gnuabi64.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsisa64r6_unknown_linux_gnuabi64.rs rename to compiler/rustc_target/src/spec/targets/mipsisa64r6_unknown_linux_gnuabi64.rs diff --git a/compiler/rustc_target/src/spec/mipsisa64r6el_unknown_linux_gnuabi64.rs b/compiler/rustc_target/src/spec/targets/mipsisa64r6el_unknown_linux_gnuabi64.rs similarity index 100% rename from compiler/rustc_target/src/spec/mipsisa64r6el_unknown_linux_gnuabi64.rs rename to compiler/rustc_target/src/spec/targets/mipsisa64r6el_unknown_linux_gnuabi64.rs diff --git a/compiler/rustc_target/src/spec/msp430_none_elf.rs b/compiler/rustc_target/src/spec/targets/msp430_none_elf.rs similarity index 100% rename from compiler/rustc_target/src/spec/msp430_none_elf.rs rename to compiler/rustc_target/src/spec/targets/msp430_none_elf.rs diff --git a/compiler/rustc_target/src/spec/nvptx64_nvidia_cuda.rs b/compiler/rustc_target/src/spec/targets/nvptx64_nvidia_cuda.rs similarity index 100% rename from compiler/rustc_target/src/spec/nvptx64_nvidia_cuda.rs rename to compiler/rustc_target/src/spec/targets/nvptx64_nvidia_cuda.rs diff --git a/compiler/rustc_target/src/spec/powerpc64_ibm_aix.rs b/compiler/rustc_target/src/spec/targets/powerpc64_ibm_aix.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc64_ibm_aix.rs rename to compiler/rustc_target/src/spec/targets/powerpc64_ibm_aix.rs diff --git a/compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/powerpc64_unknown_freebsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs rename to compiler/rustc_target/src/spec/targets/powerpc64_unknown_freebsd.rs diff --git a/compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/powerpc64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc64_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/powerpc64_unknown_openbsd.rs b/compiler/rustc_target/src/spec/targets/powerpc64_unknown_openbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc64_unknown_openbsd.rs rename to compiler/rustc_target/src/spec/targets/powerpc64_unknown_openbsd.rs diff --git a/compiler/rustc_target/src/spec/powerpc64_wrs_vxworks.rs b/compiler/rustc_target/src/spec/targets/powerpc64_wrs_vxworks.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc64_wrs_vxworks.rs rename to compiler/rustc_target/src/spec/targets/powerpc64_wrs_vxworks.rs diff --git a/compiler/rustc_target/src/spec/powerpc64le_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_freebsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc64le_unknown_freebsd.rs rename to compiler/rustc_target/src/spec/targets/powerpc64le_unknown_freebsd.rs diff --git a/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc64le_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/powerpc_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/powerpc_unknown_freebsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc_unknown_freebsd.rs rename to compiler/rustc_target/src/spec/targets/powerpc_unknown_freebsd.rs diff --git a/compiler/rustc_target/src/spec/powerpc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/powerpc_unknown_linux_gnuspe.rs b/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_gnuspe.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc_unknown_linux_gnuspe.rs rename to compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_gnuspe.rs diff --git a/compiler/rustc_target/src/spec/powerpc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/powerpc_unknown_netbsd.rs b/compiler/rustc_target/src/spec/targets/powerpc_unknown_netbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc_unknown_netbsd.rs rename to compiler/rustc_target/src/spec/targets/powerpc_unknown_netbsd.rs diff --git a/compiler/rustc_target/src/spec/powerpc_unknown_openbsd.rs b/compiler/rustc_target/src/spec/targets/powerpc_unknown_openbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc_unknown_openbsd.rs rename to compiler/rustc_target/src/spec/targets/powerpc_unknown_openbsd.rs diff --git a/compiler/rustc_target/src/spec/powerpc_wrs_vxworks.rs b/compiler/rustc_target/src/spec/targets/powerpc_wrs_vxworks.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc_wrs_vxworks.rs rename to compiler/rustc_target/src/spec/targets/powerpc_wrs_vxworks.rs diff --git a/compiler/rustc_target/src/spec/powerpc_wrs_vxworks_spe.rs b/compiler/rustc_target/src/spec/targets/powerpc_wrs_vxworks_spe.rs similarity index 100% rename from compiler/rustc_target/src/spec/powerpc_wrs_vxworks_spe.rs rename to compiler/rustc_target/src/spec/targets/powerpc_wrs_vxworks_spe.rs diff --git a/compiler/rustc_target/src/spec/riscv32gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv32gc_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/riscv32gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv32gc_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/riscv32i_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/riscv32i_unknown_none_elf.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv32i_unknown_none_elf.rs rename to compiler/rustc_target/src/spec/targets/riscv32i_unknown_none_elf.rs diff --git a/compiler/rustc_target/src/spec/riscv32im_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/riscv32im_unknown_none_elf.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv32im_unknown_none_elf.rs rename to compiler/rustc_target/src/spec/targets/riscv32im_unknown_none_elf.rs diff --git a/compiler/rustc_target/src/spec/riscv32imac_esp_espidf.rs b/compiler/rustc_target/src/spec/targets/riscv32imac_esp_espidf.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv32imac_esp_espidf.rs rename to compiler/rustc_target/src/spec/targets/riscv32imac_esp_espidf.rs diff --git a/compiler/rustc_target/src/spec/riscv32imac_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/riscv32imac_unknown_none_elf.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv32imac_unknown_none_elf.rs rename to compiler/rustc_target/src/spec/targets/riscv32imac_unknown_none_elf.rs diff --git a/compiler/rustc_target/src/spec/riscv32imac_unknown_xous_elf.rs b/compiler/rustc_target/src/spec/targets/riscv32imac_unknown_xous_elf.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv32imac_unknown_xous_elf.rs rename to compiler/rustc_target/src/spec/targets/riscv32imac_unknown_xous_elf.rs diff --git a/compiler/rustc_target/src/spec/riscv32imc_esp_espidf.rs b/compiler/rustc_target/src/spec/targets/riscv32imc_esp_espidf.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv32imc_esp_espidf.rs rename to compiler/rustc_target/src/spec/targets/riscv32imc_esp_espidf.rs diff --git a/compiler/rustc_target/src/spec/riscv32imc_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/riscv32imc_unknown_none_elf.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv32imc_unknown_none_elf.rs rename to compiler/rustc_target/src/spec/targets/riscv32imc_unknown_none_elf.rs diff --git a/compiler/rustc_target/src/spec/riscv64_linux_android.rs b/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv64_linux_android.rs rename to compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_freebsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs rename to compiler/rustc_target/src/spec/targets/riscv64gc_unknown_freebsd.rs diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_fuchsia.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs rename to compiler/rustc_target/src/spec/targets/riscv64gc_unknown_fuchsia.rs diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_hermit.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_hermit.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv64gc_unknown_hermit.rs rename to compiler/rustc_target/src/spec/targets/riscv64gc_unknown_hermit.rs diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_netbsd.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_netbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv64gc_unknown_netbsd.rs rename to compiler/rustc_target/src/spec/targets/riscv64gc_unknown_netbsd.rs diff --git a/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_none_elf.rs similarity index 96% rename from compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs rename to compiler/rustc_target/src/spec/targets/riscv64gc_unknown_none_elf.rs index ab3c14e3fe73d..f29e224244ef5 100644 --- a/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs +++ b/compiler/rustc_target/src/spec/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/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_openbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs rename to compiler/rustc_target/src/spec/targets/riscv64gc_unknown_openbsd.rs diff --git a/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/riscv64imac_unknown_none_elf.rs similarity index 100% rename from compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs rename to compiler/rustc_target/src/spec/targets/riscv64imac_unknown_none_elf.rs diff --git a/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/s390x_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/s390x_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/sparc64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/sparc64_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/sparc64_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/sparc64_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/sparc64_unknown_netbsd.rs b/compiler/rustc_target/src/spec/targets/sparc64_unknown_netbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/sparc64_unknown_netbsd.rs rename to compiler/rustc_target/src/spec/targets/sparc64_unknown_netbsd.rs diff --git a/compiler/rustc_target/src/spec/sparc64_unknown_openbsd.rs b/compiler/rustc_target/src/spec/targets/sparc64_unknown_openbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/sparc64_unknown_openbsd.rs rename to compiler/rustc_target/src/spec/targets/sparc64_unknown_openbsd.rs diff --git a/compiler/rustc_target/src/spec/sparc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/sparc_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/sparc_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/sparc_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/sparc_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/sparc_unknown_none_elf.rs similarity index 100% rename from compiler/rustc_target/src/spec/sparc_unknown_none_elf.rs rename to compiler/rustc_target/src/spec/targets/sparc_unknown_none_elf.rs diff --git a/compiler/rustc_target/src/spec/sparcv9_sun_solaris.rs b/compiler/rustc_target/src/spec/targets/sparcv9_sun_solaris.rs similarity index 100% rename from compiler/rustc_target/src/spec/sparcv9_sun_solaris.rs rename to compiler/rustc_target/src/spec/targets/sparcv9_sun_solaris.rs diff --git a/compiler/rustc_target/src/spec/thumbv4t_none_eabi.rs b/compiler/rustc_target/src/spec/targets/thumbv4t_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv4t_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/thumbv4t_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/thumbv5te_none_eabi.rs b/compiler/rustc_target/src/spec/targets/thumbv5te_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv5te_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/thumbv5te_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs b/compiler/rustc_target/src/spec/targets/thumbv6m_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/thumbv6m_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/thumbv7a_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/thumbv7a_pc_windows_msvc.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv7a_pc_windows_msvc.rs rename to compiler/rustc_target/src/spec/targets/thumbv7a_pc_windows_msvc.rs diff --git a/compiler/rustc_target/src/spec/thumbv7a_uwp_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/thumbv7a_uwp_windows_msvc.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv7a_uwp_windows_msvc.rs rename to compiler/rustc_target/src/spec/targets/thumbv7a_uwp_windows_msvc.rs diff --git a/compiler/rustc_target/src/spec/thumbv7em_none_eabi.rs b/compiler/rustc_target/src/spec/targets/thumbv7em_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv7em_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/thumbv7em_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/thumbv7em_none_eabihf.rs b/compiler/rustc_target/src/spec/targets/thumbv7em_none_eabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv7em_none_eabihf.rs rename to compiler/rustc_target/src/spec/targets/thumbv7em_none_eabihf.rs diff --git a/compiler/rustc_target/src/spec/thumbv7m_none_eabi.rs b/compiler/rustc_target/src/spec/targets/thumbv7m_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv7m_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/thumbv7m_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/thumbv7neon_linux_androideabi.rs b/compiler/rustc_target/src/spec/targets/thumbv7neon_linux_androideabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv7neon_linux_androideabi.rs rename to compiler/rustc_target/src/spec/targets/thumbv7neon_linux_androideabi.rs diff --git a/compiler/rustc_target/src/spec/thumbv7neon_unknown_linux_gnueabihf.rs b/compiler/rustc_target/src/spec/targets/thumbv7neon_unknown_linux_gnueabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv7neon_unknown_linux_gnueabihf.rs rename to compiler/rustc_target/src/spec/targets/thumbv7neon_unknown_linux_gnueabihf.rs diff --git a/compiler/rustc_target/src/spec/thumbv7neon_unknown_linux_musleabihf.rs b/compiler/rustc_target/src/spec/targets/thumbv7neon_unknown_linux_musleabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv7neon_unknown_linux_musleabihf.rs rename to compiler/rustc_target/src/spec/targets/thumbv7neon_unknown_linux_musleabihf.rs diff --git a/compiler/rustc_target/src/spec/thumbv8m_base_none_eabi.rs b/compiler/rustc_target/src/spec/targets/thumbv8m_base_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv8m_base_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/thumbv8m_base_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/thumbv8m_main_none_eabi.rs b/compiler/rustc_target/src/spec/targets/thumbv8m_main_none_eabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv8m_main_none_eabi.rs rename to compiler/rustc_target/src/spec/targets/thumbv8m_main_none_eabi.rs diff --git a/compiler/rustc_target/src/spec/thumbv8m_main_none_eabihf.rs b/compiler/rustc_target/src/spec/targets/thumbv8m_main_none_eabihf.rs similarity index 100% rename from compiler/rustc_target/src/spec/thumbv8m_main_none_eabihf.rs rename to compiler/rustc_target/src/spec/targets/thumbv8m_main_none_eabihf.rs diff --git a/compiler/rustc_target/src/spec/wasm32_unknown_emscripten.rs b/compiler/rustc_target/src/spec/targets/wasm32_unknown_emscripten.rs similarity index 100% rename from compiler/rustc_target/src/spec/wasm32_unknown_emscripten.rs rename to compiler/rustc_target/src/spec/targets/wasm32_unknown_emscripten.rs diff --git a/compiler/rustc_target/src/spec/wasm32_unknown_unknown.rs b/compiler/rustc_target/src/spec/targets/wasm32_unknown_unknown.rs similarity index 100% rename from compiler/rustc_target/src/spec/wasm32_unknown_unknown.rs rename to compiler/rustc_target/src/spec/targets/wasm32_unknown_unknown.rs diff --git a/compiler/rustc_target/src/spec/wasm32_wasi.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs similarity index 100% rename from compiler/rustc_target/src/spec/wasm32_wasi.rs rename to compiler/rustc_target/src/spec/targets/wasm32_wasi.rs diff --git a/compiler/rustc_target/src/spec/wasm32_wasi_preview1_threads.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasi_preview1_threads.rs similarity index 100% rename from compiler/rustc_target/src/spec/wasm32_wasi_preview1_threads.rs rename to compiler/rustc_target/src/spec/targets/wasm32_wasi_preview1_threads.rs diff --git a/compiler/rustc_target/src/spec/wasm64_unknown_unknown.rs b/compiler/rustc_target/src/spec/targets/wasm64_unknown_unknown.rs similarity index 100% rename from compiler/rustc_target/src/spec/wasm64_unknown_unknown.rs rename to compiler/rustc_target/src/spec/targets/wasm64_unknown_unknown.rs diff --git a/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs b/compiler/rustc_target/src/spec/targets/x86_64_apple_darwin.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_apple_darwin.rs rename to compiler/rustc_target/src/spec/targets/x86_64_apple_darwin.rs diff --git a/compiler/rustc_target/src/spec/x86_64_apple_ios.rs b/compiler/rustc_target/src/spec/targets/x86_64_apple_ios.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_apple_ios.rs rename to compiler/rustc_target/src/spec/targets/x86_64_apple_ios.rs diff --git a/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs b/compiler/rustc_target/src/spec/targets/x86_64_apple_ios_macabi.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs rename to compiler/rustc_target/src/spec/targets/x86_64_apple_ios_macabi.rs diff --git a/compiler/rustc_target/src/spec/x86_64_apple_tvos.rs b/compiler/rustc_target/src/spec/targets/x86_64_apple_tvos.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_apple_tvos.rs rename to compiler/rustc_target/src/spec/targets/x86_64_apple_tvos.rs diff --git a/compiler/rustc_target/src/spec/x86_64_apple_watchos_sim.rs b/compiler/rustc_target/src/spec/targets/x86_64_apple_watchos_sim.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_apple_watchos_sim.rs rename to compiler/rustc_target/src/spec/targets/x86_64_apple_watchos_sim.rs diff --git a/compiler/rustc_target/src/spec/x86_64_fortanix_unknown_sgx.rs b/compiler/rustc_target/src/spec/targets/x86_64_fortanix_unknown_sgx.rs similarity index 97% rename from compiler/rustc_target/src/spec/x86_64_fortanix_unknown_sgx.rs rename to compiler/rustc_target/src/spec/targets/x86_64_fortanix_unknown_sgx.rs index a7ed74f47212f..f4117edc3ff5d 100644 --- a/compiler/rustc_target/src/spec/x86_64_fortanix_unknown_sgx.rs +++ b/compiler/rustc_target/src/spec/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 new file mode 100644 index 0000000000000..46df00e9c02b7 --- /dev/null +++ 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/compiler/rustc_target/src/spec/x86_64_linux_android.rs b/compiler/rustc_target/src/spec/targets/x86_64_linux_android.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_linux_android.rs rename to compiler/rustc_target/src/spec/targets/x86_64_linux_android.rs diff --git a/compiler/rustc_target/src/spec/x86_64_pc_nto_qnx710.rs b/compiler/rustc_target/src/spec/targets/x86_64_pc_nto_qnx710.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_pc_nto_qnx710.rs rename to compiler/rustc_target/src/spec/targets/x86_64_pc_nto_qnx710.rs diff --git a/compiler/rustc_target/src/spec/x86_64_pc_solaris.rs b/compiler/rustc_target/src/spec/targets/x86_64_pc_solaris.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_pc_solaris.rs rename to compiler/rustc_target/src/spec/targets/x86_64_pc_solaris.rs diff --git a/compiler/rustc_target/src/spec/x86_64_pc_windows_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_pc_windows_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_pc_windows_gnu.rs rename to compiler/rustc_target/src/spec/targets/x86_64_pc_windows_gnu.rs diff --git a/compiler/rustc_target/src/spec/x86_64_pc_windows_gnullvm.rs b/compiler/rustc_target/src/spec/targets/x86_64_pc_windows_gnullvm.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_pc_windows_gnullvm.rs rename to compiler/rustc_target/src/spec/targets/x86_64_pc_windows_gnullvm.rs diff --git a/compiler/rustc_target/src/spec/x86_64_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/x86_64_pc_windows_msvc.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_pc_windows_msvc.rs rename to compiler/rustc_target/src/spec/targets/x86_64_pc_windows_msvc.rs diff --git a/compiler/rustc_target/src/spec/x86_64_sun_solaris.rs b/compiler/rustc_target/src/spec/targets/x86_64_sun_solaris.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_sun_solaris.rs rename to compiler/rustc_target/src/spec/targets/x86_64_sun_solaris.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unikraft_linux_musl.rs b/compiler/rustc_target/src/spec/targets/x86_64_unikraft_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unikraft_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unikraft_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_dragonfly.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_dragonfly.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_dragonfly.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_dragonfly.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_freebsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_freebsd.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_freebsd.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_fuchsia.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_fuchsia.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_fuchsia.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_fuchsia.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_haiku.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_haiku.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_haiku.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_haiku.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_hermit.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_hermit.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_illumos.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_illumos.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_illumos.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_illumos.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_l4re_uclibc.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_l4re_uclibc.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_l4re_uclibc.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_l4re_uclibc.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnux32.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnux32.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_linux_gnux32.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnux32.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_linux_musl.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_ohos.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_ohos.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_linux_ohos.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_ohos.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_netbsd.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_netbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_netbsd.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_netbsd.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs similarity index 89% rename from compiler/rustc_target/src/spec/x86_64_unknown_none.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs index fe3b24f2d4afa..9aa95a35f8e55 100644 --- a/compiler/rustc_target/src/spec/x86_64_unknown_none.rs +++ b/compiler/rustc_target/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/compiler/rustc_target/src/spec/x86_64_unknown_openbsd.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_openbsd.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_openbsd.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_openbsd.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_redox.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_redox.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_redox.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_redox.rs diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs rename to compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs diff --git a/compiler/rustc_target/src/spec/x86_64_uwp_windows_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_uwp_windows_gnu.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_uwp_windows_gnu.rs rename to compiler/rustc_target/src/spec/targets/x86_64_uwp_windows_gnu.rs diff --git a/compiler/rustc_target/src/spec/x86_64_uwp_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/x86_64_uwp_windows_msvc.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_uwp_windows_msvc.rs rename to compiler/rustc_target/src/spec/targets/x86_64_uwp_windows_msvc.rs diff --git a/compiler/rustc_target/src/spec/x86_64_wrs_vxworks.rs b/compiler/rustc_target/src/spec/targets/x86_64_wrs_vxworks.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64_wrs_vxworks.rs rename to compiler/rustc_target/src/spec/targets/x86_64_wrs_vxworks.rs diff --git a/compiler/rustc_target/src/spec/x86_64h_apple_darwin.rs b/compiler/rustc_target/src/spec/targets/x86_64h_apple_darwin.rs similarity index 100% rename from compiler/rustc_target/src/spec/x86_64h_apple_darwin.rs rename to compiler/rustc_target/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 deleted file mode 100644 index 96fed09756667..0000000000000 --- a/compiler/rustc_target/src/spec/x86_64_fuchsia.rs +++ /dev/null @@ -1 +0,0 @@ -pub use crate::spec::x86_64_unknown_fuchsia::target;