Handle "uwp" as a windows target OS

Author: chouquette

src/bootstrap/bin/rustc.rs

@@ -237,6 +237,7 @@ fn main() {
                 cmd.arg("-Z").arg("osx-rpath-install-name");
                 Some("-Wl,-rpath,@loader_path/../lib")
             } else if !target.contains("windows") &&
+                      !target.contains("uwp") &&
                       !target.contains("wasm32") &&
                       !target.contains("fuchsia") {
                 Some("-Wl,-rpath,$ORIGIN/../lib")

src/bootstrap/compile.rs

@@ -297,7 +297,7 @@ impl Step for StartupObjects {
     fn run(self, builder: &Builder<'_>) {
         let for_compiler = self.compiler;
         let target = self.target;
-        if !target.contains("pc-windows-gnu") {
+        if !target.contains("pc-windows-gnu") && !target.contains("pc-uwp-gnu") {
             return
         }
 
@@ -752,6 +752,7 @@ pub fn build_codegen_backend(builder: &Builder<'_>,
             if builder.config.llvm_static_stdcpp &&
                !target.contains("freebsd") &&
                !target.contains("windows") &&
+               !target.contains("uwp") &&
                !target.contains("apple") {
                 let file = compiler_file(builder,
                                          builder.cxx(target).unwrap(),

src/bootstrap/native.rs

@@ -183,7 +183,7 @@ impl Step for Llvm {
 
         // For distribution we want the LLVM tools to be *statically* linked to libstdc++
         if builder.config.llvm_tools_enabled || want_lldb {
-            if !target.contains("windows") {
+            if !target.contains("windows") && !target.contains("uwp") {
                 if target.contains("apple") {
                     cfg.define("CMAKE_EXE_LINKER_FLAGS", "-static-libstdc++");
                 } else {
@@ -405,6 +405,7 @@ fn configure_cmake(builder: &Builder<'_>,
     let mut cxxflags = builder.cflags(target, GitRepo::Llvm).join(" ");
     if builder.config.llvm_static_stdcpp &&
         !target.contains("windows") &&
+        !target.contains("uwp") &&
         !target.contains("netbsd")
     {
         cxxflags.push_str(" -static-libstdc++");

src/bootstrap/tool.rs

@@ -717,7 +717,7 @@ impl<'a> Builder<'a> {
                 additional_paths.push(lld_bin_path);
             }
 
-            if host.contains("windows") {
+            if host.contains("windows") || host.contains("uwp") {
                 // On Windows, PATH and the dynamic library path are the same,
                 // so we just add the LLVM bin path to lib_path
                 lib_paths.extend(additional_paths);

src/bootstrap/util.rs

@@ -16,7 +16,7 @@ use crate::builder::Builder;
 
 /// Returns the `name` as the filename of a static library for `target`.
 pub fn staticlib(name: &str, target: &str) -> String {
-    if target.contains("windows") {
+    if target.contains("windows") || target.contains("uwp") {
         format!("{}.lib", name)
     } else {
         format!("lib{}.a", name)
@@ -26,7 +26,7 @@ pub fn staticlib(name: &str, target: &str) -> String {
 /// Given an executable called `name`, return the filename for the
 /// executable for a particular target.
 pub fn exe(name: &str, target: &str) -> String {
-    if target.contains("windows") {
+    if target.contains("windows") || target.contains("uwp") {
         format!("{}.exe", name)
     } else {
         name.to_string()
@@ -41,7 +41,7 @@ pub fn is_dylib(name: &str) -> bool {
 /// Returns the corresponding relative library directory that the compiler's
 /// dylibs will be found in.
 pub fn libdir(target: &str) -> &'static str {
-    if target.contains("windows") {"bin"} else {"lib"}
+    if target.contains("windows") || target.contains("uwp") {"bin"} else {"lib"}
 }
 
 /// Adds a list of lookup paths to `cmd`'s dynamic library lookup path.

src/librustc_codegen_llvm/abi.rs

@@ -441,7 +441,8 @@ impl<'tcx> FnTypeExt<'tcx> for FnType<'tcx, Ty<'tcx>> {
         };
 
         let target = &cx.sess().target.target;
-        let win_x64_gnu = target.target_os == "windows"
+        let win_x64_gnu = (target.target_os == "windows" ||
+                           target.target_os == "uwp")
                        && target.arch == "x86_64"
                        && target.target_env == "gnu";
         let linux_s390x = target.target_os == "linux"

src/libstd/build.rs

@@ -44,6 +44,8 @@ fn main() {
         println!("cargo:rustc-link-lib=advapi32");
         println!("cargo:rustc-link-lib=ws2_32");
         println!("cargo:rustc-link-lib=userenv");
+    } else if target.contains("uwp") {
+        println!("cargo:rustc-link-lib=ws2_32");
     } else if target.contains("fuchsia") {
         println!("cargo:rustc-link-lib=zircon");
         println!("cargo:rustc-link-lib=fdio");

src/rtstartup/rsbegin.rs

@@ -33,7 +33,7 @@ pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
     drop_in_place(to_drop);
 }
 
-#[cfg(all(target_os = "windows", target_arch = "x86", target_env = "gnu"))]
+#[cfg(all(any(target_os = "windows", target_os = "uwp"), target_arch = "x86", target_env = "gnu"))]
 pub mod eh_frames {
     #[no_mangle]
     #[link_section = ".eh_frame"]

src/rtstartup/rsend.rs

@@ -21,7 +21,7 @@ pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
     drop_in_place(to_drop);
 }
 
-#[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))]
+#[cfg(all(any(target_os = "windows", target_os = "uwp"), target_arch = "x86", target_env = "gnu"))]
 pub mod eh_frames {
     // Terminate the frame unwind info section with a 0 as a sentinel;
     // this would be the 'length' field in a real FDE.