Add UWP MSVC targets

README.md

@@ -144,7 +144,7 @@ then you may need to force rustbuild to use an older version. This can be done
 by manually calling the appropriate vcvars file before running the bootstrap.
 
 ```batch
-> CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
+> CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
 > python x.py build
 ```
 

src/librustc_codegen_ssa/back/link.rs

@@ -1027,6 +1027,20 @@ fn link_args<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker,
  let t = &sess.target.target;
 
  cmd.include_path(&fix_windows_verbatim_for_gcc(&lib_path));
+
+ if t.linker_flavor == LinkerFlavor::Msvc && t.target_vendor == "uwp" {
+ let link_tool = windows_registry::find_tool("x86_64-pc-windows-msvc", "link.exe")
+ .expect("no path found for link.exe");
+
+ let original_path = link_tool.path();
+ let root_lib_path = original_path.ancestors().skip(4).next().unwrap();
+ if t.arch == "aarch64".to_string() {
+ cmd.include_path(&root_lib_path.join(format!("lib\\arm64\\store")));
+ } else {
+ cmd.include_path(&root_lib_path.join(format!("lib\\{}\\store", t.arch)));
+ }
+ }
+
  for obj in codegen_results.modules.iter().filter_map(|m| m.object.as_ref()) {
  cmd.add_object(obj);
  }

src/librustc_target/spec/aarch64_uwp_windows_msvc.rs

@@ -0,0 +1,24 @@
+use crate::spec::{LinkerFlavor, Target, TargetResult, PanicStrategy};
+
+pub fn target() -> TargetResult {
+ let mut base = super::windows_uwp_msvc_base::opts();
+ base.max_atomic_width = Some(64);
+ base.has_elf_tls = true;
+
+ // FIXME: this shouldn't be panic=abort, it should be panic=unwind
+ base.panic_strategy = PanicStrategy::Abort;
+
+ Ok(Target {
+ llvm_target: "aarch64-pc-windows-msvc".to_string(),
+ target_endian: "little".to_string(),
+ target_pointer_width: "64".to_string(),
+ target_c_int_width: "32".to_string(),
+ data_layout: "e-m:w-p:64:64-i32:32-i64:64-i128:128-n32:64-S128".to_string(),
+ arch: "aarch64".to_string(),
+ target_os: "windows".to_string(),
+ target_env: "msvc".to_string(),
+ target_vendor: "uwp".to_string(),
+ linker_flavor: LinkerFlavor::Msvc,
+ options: base,
+ })
+}

src/librustc_target/spec/i686_uwp_windows_msvc.rs

@@ -0,0 +1,22 @@
+use crate::spec::{LinkerFlavor, Target, TargetResult};
+
+pub fn target() -> TargetResult {
+ let mut base = super::windows_uwp_msvc_base::opts();
+ base.cpu = "pentium4".to_string();
+ base.max_atomic_width = Some(64);
+ base.has_elf_tls = true;
+
+ Ok(Target {
+ llvm_target: "i686-pc-windows-msvc".to_string(),
+ target_endian: "little".to_string(),
+ target_pointer_width: "32".to_string(),
+ target_c_int_width: "32".to_string(),
+ data_layout: "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32".to_string(),
+ arch: "x86".to_string(),
+ target_os: "windows".to_string(),
+ target_env: "msvc".to_string(),
+ target_vendor: "uwp".to_string(),
+ linker_flavor: LinkerFlavor::Msvc,
+ options: base,
+ })
+}

src/librustc_target/spec/mod.rs

@@ -61,6 +61,7 @@ mod uefi_base;
 mod windows_base;
 mod windows_msvc_base;
 mod windows_uwp_base;
+mod windows_uwp_msvc_base;
 mod thumb_base;
 mod l4re_base;
 mod fuchsia_base;
@@ -439,8 +440,11 @@ supported_targets! {
  ("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu),
 
  ("aarch64-pc-windows-msvc", aarch64_pc_windows_msvc),
+ ("aarch64-uwp-windows-msvc", aarch64_uwp_windows_msvc),
  ("x86_64-pc-windows-msvc", x86_64_pc_windows_msvc),
+ ("x86_64-uwp-windows-msvc", x86_64_uwp_windows_msvc),
  ("i686-pc-windows-msvc", i686_pc_windows_msvc),
+ ("i686-uwp-windows-msvc", i686_uwp_windows_msvc),
  ("i586-pc-windows-msvc", i586_pc_windows_msvc),
  ("thumbv7a-pc-windows-msvc", thumbv7a_pc_windows_msvc),
 

src/librustc_target/spec/windows_uwp_msvc_base.rs

@@ -0,0 +1,33 @@
+use crate::spec::{LinkArgs, LinkerFlavor, TargetOptions};
+use std::default::Default;
+
+pub fn opts() -> TargetOptions {
+ let mut args = LinkArgs::new();
+ args.insert(LinkerFlavor::Msvc,
+ vec!["/NOLOGO".to_string(),
+ "/NXCOMPAT".to_string(),
+ "/APPCONTAINER".to_string(),
+ "mincore.lib".to_string()]);
+
+ TargetOptions {
+ function_sections: true,
+ dynamic_linking: true,
+ executables: true,
+ dll_prefix: String::new(),
+ dll_suffix: ".dll".to_string(),
+ exe_suffix: ".exe".to_string(),
+ staticlib_prefix: String::new(),
+ staticlib_suffix: ".lib".to_string(),
+ target_family: Some("windows".to_string()),
+ is_like_windows: true,
+ is_like_msvc: true,
+ pre_link_args: args,
+ crt_static_allows_dylibs: true,
+ crt_static_respected: true,
+ abi_return_struct_as_int: true,
+ emit_debug_gdb_scripts: false,
+ requires_uwtable: true,
+
+ .. Default::default()
+ }
+}

src/librustc_target/spec/x86_64_uwp_windows_msvc.rs

@@ -0,0 +1,22 @@
+use crate::spec::{LinkerFlavor, Target, TargetResult};
+
+pub fn target() -> TargetResult {
+ let mut base = super::windows_uwp_msvc_base::opts();
+ base.cpu = "x86-64".to_string();
+ base.max_atomic_width = Some(64);
+ base.has_elf_tls = true;
+
+ Ok(Target {
+ llvm_target: "x86_64-pc-windows-msvc".to_string(),
+ target_endian: "little".to_string(),
+ target_pointer_width: "64".to_string(),
+ target_c_int_width: "32".to_string(),
+ data_layout: "e-m:w-i64:64-f80:128-n8:16:32:64-S128".to_string(),
+ arch: "x86_64".to_string(),
+ target_os: "windows".to_string(),
+ target_env: "msvc".to_string(),
+ target_vendor: "uwp".to_string(),
+ linker_flavor: LinkerFlavor::Msvc,
+ options: base,
+ })
+}

src/libstd/sys/windows/c.rs

@@ -714,7 +714,7 @@ if #[cfg(target_vendor = "uwp")] {
  pub struct FILE_STANDARD_INFO {
  pub AllocationSize: LARGE_INTEGER,
  pub EndOfFile: LARGE_INTEGER,
- pub NumberOfLink: DWORD,
+ pub NumberOfLinks: DWORD,
  pub DeletePending: BOOLEAN,
  pub Directory: BOOLEAN,
  }

src/libstd/sys/windows/fs.rs

@@ -357,7 +357,7 @@ impl File {
  size as c::DWORD))?;
  attr.file_size = info.AllocationSize as u64;
  attr.number_of_links = Some(info.NumberOfLinks);
- if attr.is_reparse_point() {
+ if attr.file_type().is_reparse_point() {
  let mut b = [0; c::MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
  if let Ok((_, buf)) = self.reparse_point(&mut b) {
  attr.reparse_tag = buf.ReparseTag;