about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-10-14 19:51:34 -0700
committerbors <bors@rust-lang.org>2013-10-14 19:51:34 -0700
commit1252ad409258c2d3a2595f8a77dc7b84491cca77 (patch)
treea4340df5d161ddc70426cab2d36f0d215ebe92e2 /src/libstd
parenta7e8957c591651b6568d1b495d29ee85d11c0975 (diff)
parent45e2cf39a21b6317e01adff05a3c83c628913edc (diff)
downloadrust-1252ad409258c2d3a2595f8a77dc7b84491cca77.tar.gz
rust-1252ad409258c2d3a2595f8a77dc7b84491cca77.zip
auto merge of #9860 : thestinger/rust/abort, r=Aatch
This should be preferred to calling the libc `abort` function.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/unstable/intrinsics.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
index 59b3c264b99..7cda2b109d9 100644
--- a/src/libstd/unstable/intrinsics.rs
+++ b/src/libstd/unstable/intrinsics.rs
@@ -171,6 +171,9 @@ pub trait TyVisitor {
 }
 
 extern "rust-intrinsic" {
+    /// Abort the execution of the process.
+    #[cfg(not(stage0))]
+    pub fn abort() -> !;
 
     /// Atomic compare and exchange, sequentially consistent.
     pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;