Add {i586,i686,x86_64}-rust9x-windows-msvc targets

Author: seritools

compiler/rustc_target/src/spec/mod.rs

@@ -1795,10 +1795,13 @@ supported_targets! {
     ("x86_64-pc-windows-msvc", x86_64_pc_windows_msvc),
     ("x86_64-uwp-windows-msvc", x86_64_uwp_windows_msvc),
     ("x86_64-win7-windows-msvc", x86_64_win7_windows_msvc),
+    ("x86_64-rust9x-windows-msvc", x86_64_rust9x_windows_msvc),
     ("i686-pc-windows-msvc", i686_pc_windows_msvc),
     ("i686-uwp-windows-msvc", i686_uwp_windows_msvc),
     ("i686-win7-windows-msvc", i686_win7_windows_msvc),
+    ("i686-rust9x-windows-msvc", i686_rust9x_windows_msvc),
     ("i586-pc-windows-msvc", i586_pc_windows_msvc),
+    ("i586-rust9x-windows-msvc", i586_rust9x_windows_msvc),
     ("thumbv7a-pc-windows-msvc", thumbv7a_pc_windows_msvc),
     ("thumbv7a-uwp-windows-msvc", thumbv7a_uwp_windows_msvc),
 

compiler/rustc_target/src/spec/targets/i586_rust9x_windows_msvc.rs

@@ -0,0 +1,8 @@
+use crate::spec::Target;
+
+pub(crate) fn target() -> Target {
+    let mut base = super::i686_rust9x_windows_msvc::target();
+    base.cpu = "pentium".into();
+    base.llvm_target = "i586-pc-windows-msvc".into();
+    base
+}

compiler/rustc_target/src/spec/targets/i686_rust9x_windows_msvc.rs

@@ -0,0 +1,26 @@
+use crate::spec::{LinkerFlavor, Lld, Target};
+
+pub(crate) fn target() -> Target {
+    let mut base = super::i686_pc_windows_msvc::target();
+    base.vendor = "rust9x".into();
+
+    base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &[
+        // "/LARGEADDRESSAWARE",
+        // "/SAFESEH",
+        // ↑ these are already added in the base target
+
+        // Link to ___CxxFrameHandler (XP and earlier MSVCRT) instead of ___CxxFrameHandler3.
+        // This cannot be done in the MSVC `eh_personality` handling because LLVM hardcodes SEH
+        // support based on that name, sadly
+        "/ALTERNATENAME:___CxxFrameHandler3=___CxxFrameHandler",
+    ]);
+
+    base.metadata = crate::spec::TargetMetadata {
+        description: Some("32-bit MSVC rust9x (Windows 95/NT3.51+)".into()),
+        tier: Some(4),
+        host_tools: Some(false),
+        std: Some(true),
+    };
+
+    base
+}

compiler/rustc_target/src/spec/targets/x86_64_rust9x_windows_msvc.rs

@@ -0,0 +1,26 @@
+use crate::spec::{LinkerFlavor, Lld, Target};
+
+pub(crate) fn target() -> Target {
+    let mut base = super::x86_64_pc_windows_msvc::target();
+    // these aren't available on all x86_64 CPUs
+    // base.features = "+cx16,+sse3,+sahf".into();
+    base.plt_by_default = false;
+    base.max_atomic_width = Some(64);
+    base.vendor = "rust9x".into();
+
+    base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &[
+        // Link to ___CxxFrameHandler (XP and earlier MSVCRT) instead of ___CxxFrameHandler3.
+        // This cannot be done in the MSVC `eh_personality` handling because LLVM hardcodes SEH
+        // support based on that name, sadly
+        "/ALTERNATENAME:___CxxFrameHandler3=___CxxFrameHandler",
+    ]);
+
+    base.metadata = crate::spec::TargetMetadata {
+        description: Some("64-bit MSVC rust9x (Windows XP 64bit+)".into()),
+        tier: Some(4),
+        host_tools: Some(false),
+        std: Some(true),
+    };
+
+    base
+}

library/std/Cargo.toml

@@ -146,4 +146,5 @@ check-cfg = [
     'cfg(feature, values(any()))',
     # #[cfg(bootstrap)] rtems
     'cfg(target_os, values("rtems"))',
+    'cfg(target_vendor, values("rust9x"))',
 ]

library/windows_targets/Cargo.toml

@@ -8,3 +8,8 @@ edition = "2021"
 # Enable using raw-dylib for Windows imports.
 # This will eventually be the default.
 windows_raw_dylib = []
+
+[lints.rust]
+unexpected_cfgs = { level = "allow", check-cfg = [
+    'cfg(target_vendor, values("rust9x"))',
+] }

src/bootstrap/src/core/sanity.rs

@@ -34,6 +34,9 @@ pub struct Finder {
 // Targets can be removed from this list once they are present in the stage0 compiler (usually by updating the beta compiler of the bootstrap).
 const STAGE0_MISSING_TARGETS: &[&str] = &[
     // just a dummy comment so the list doesn't get onelined
+    "i586-rust9x-windows-msvc",
+    "i686-rust9x-windows-msvc",
+    "x86_64-rust9x-windows-msvc",
 ];
 
 /// Minimum version threshold for libstdc++ required when using prebuilt LLVM