Revert "Replace intrinsics::abort with process::abort"

This reverts commit a239419cc0.
This commit is contained in:
Josh Matthews 2017-05-16 17:37:22 -04:00
parent f87e362059
commit 5a82e8ffdd
3 changed files with 9 additions and 4 deletions

View file

@ -4,6 +4,7 @@
#![allow(non_camel_case_types)]
#![feature(box_syntax)]
#![feature(core_intrinsics)]
#![feature(link_args)]
#[macro_use]

View file

@ -12,7 +12,9 @@ macro_rules! stub(
#[allow(non_snake_case)]
pub extern "C" fn $name() {
println!("CEF stub function called: {}", stringify!($name));
::std::process::abort()
unsafe {
::std::intrinsics::abort()
}
}
)
);

View file

@ -15,7 +15,7 @@
//!
//! [glutin]: https://github.com/tomaka/glutin
#![feature(start)]
#![feature(start, core_intrinsics)]
#[cfg(target_os = "android")]
extern crate android_injected_glue;
@ -58,7 +58,7 @@ pub mod platform {
fn install_crash_handler() {
use backtrace::Backtrace;
use sig::ffi::Sig;
use std::process::abort;
use std::intrinsics::abort;
use std::thread;
fn handler(_sig: i32) {
@ -67,7 +67,9 @@ fn install_crash_handler() {
.map(|n| format!(" for thread \"{}\"", n))
.unwrap_or("".to_owned());
println!("Stack trace{}\n{:?}", name, Backtrace::new());
abort();
unsafe {
abort();
}
}
signal!(Sig::SEGV, handler); // handle segfaults