Fix linking on mingw

Author: Amanieu

src/libpanic_unwind/gcc.rs

@@ -324,7 +324,7 @@ unsafe fn find_eh_action(
 // See docs in the `unwind` module. This needs to be implemented in assembly
 // because _Unwind_Resume expects to be called directly from the landing pad.
 // This means that we need to force a tail call here.
-#[cfg(all(
+/*#[cfg(all(
     not(bootstrap),
     target_os = "windows",
     any(target_arch = "x86", target_arch = "x86_64"),
@@ -343,7 +343,7 @@ _rust_eh_unwind_resume:
     jmp __Unwind_Resume
     .cfi_endproc
     "#
-}
+}*/
 #[cfg(all(
     bootstrap,
     target_os = "windows",

src/librustc_codegen_ssa/back/link.rs

@@ -490,8 +490,8 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>(
     info!("preparing {:?} to {:?}", crate_type, out_filename);
     let (linker, flavor) = linker_and_flavor(sess);
 
-    let any_dynamic_crate =
-        codegen_results.crate_info.dependency_formats.iter().any(|(ty, list)| {
+    let any_dynamic_crate = crate_type == config::CrateType::Dylib
+        || codegen_results.crate_info.dependency_formats.iter().any(|(ty, list)| {
             *ty == crate_type && list.iter().any(|&linkage| linkage == Linkage::Dynamic)
         });
 

src/librustc_target/spec/windows_base.rs

@@ -46,6 +46,7 @@ pub fn opts() -> TargetOptions {
             // unwinding across DLL boundaries.
             "-lgcc_s".to_string(),
             "-lgcc".to_string(),
+            "-lkernel32".to_string(),
         ],
     );
     late_link_args_static.insert(
@@ -59,6 +60,7 @@ pub fn opts() -> TargetOptions {
             "-lgcc".to_string(),
             "-lgcc_eh".to_string(),
             "-lpthread".to_string(),
+            "-lkernel32".to_string(),
         ],
     );