summaryrefslogtreecommitdiff
path: root/src/libpanic_abort
diff options
context:
space:
mode:
authorJeremy Soller <jackpot51@gmail.com>2016-11-10 19:33:59 -0700
committerJeremy Soller <jackpot51@gmail.com>2016-11-10 19:33:59 -0700
commita90850995f9f177c910ba548f1a6312353673926 (patch)
treed224a0893e2ae959923286d9cdcc64f820f5939a /src/libpanic_abort
parentced32a08f3bf7325bf3fe6488e21b108f996abc5 (diff)
downloadrust-a90850995f9f177c910ba548f1a6312353673926.tar.gz
Fixes for stdio and processes on Redox
Diffstat (limited to 'src/libpanic_abort')
-rw-r--r--src/libpanic_abort/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libpanic_abort/lib.rs b/src/libpanic_abort/lib.rs
index b87160dd75d..26bc46931bd 100644
--- a/src/libpanic_abort/lib.rs
+++ b/src/libpanic_abort/lib.rs
@@ -28,7 +28,7 @@
#![panic_runtime]
#![feature(panic_runtime)]
#![cfg_attr(unix, feature(libc))]
-#![cfg_attr(windows, feature(core_intrinsics))]
+#![cfg_attr(any(target_os = "redox", windows), feature(core_intrinsics))]
// Rust's "try" function, but if we're aborting on panics we just call the
// function as there's nothing else we need to do here.
@@ -61,7 +61,7 @@ pub unsafe extern fn __rust_start_panic(_data: usize, _vtable: usize) -> u32 {
libc::abort();
}
- #[cfg(windows)]
+ #[cfg(any(target_os = "redox", windows))]
unsafe fn abort() -> ! {
core::intrinsics::abort();
}