about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2020-09-18 13:15:54 +0200
committerRalf Jung <post@ralfj.de>2020-09-18 13:15:54 +0200
commit0810c3ef1971b87f05561b8da9947f52a5270f29 (patch)
treeeeba16cd2fed31215772d70c8eb52360df38b0ad
parent95386b656e91168bf53e2ab63c6b992cae591fe7 (diff)
downloadrust-0810c3ef1971b87f05561b8da9947f52a5270f29.tar.gz
rust-0810c3ef1971b87f05561b8da9947f52a5270f29.zip
support panic=abort in Miri
-rw-r--r--library/panic_abort/src/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/panic_abort/src/lib.rs b/library/panic_abort/src/lib.rs
index 3b08a64b22d..e5800fbceb2 100644
--- a/library/panic_abort/src/lib.rs
+++ b/library/panic_abort/src/lib.rs
@@ -47,7 +47,7 @@ pub unsafe extern "C" fn __rust_start_panic(_payload: usize) -> u32 {
                 }
                 __rust_abort();
             }
-        } else if #[cfg(windows)] {
+        } else if #[cfg(all(windows, not(miri)))] {
             // On Windows, use the processor-specific __fastfail mechanism. In Windows 8
             // and later, this will terminate the process immediately without running any
             // in-process exception handlers. In earlier versions of Windows, this