diff options
Diffstat (limited to 'src/libpanic_abort')
| -rw-r--r-- | src/libpanic_abort/lib.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libpanic_abort/lib.rs b/src/libpanic_abort/lib.rs index 14221f3d79e..cf05e56e53c 100644 --- a/src/libpanic_abort/lib.rs +++ b/src/libpanic_abort/lib.rs @@ -24,14 +24,13 @@ #![feature(core_intrinsics)] #![feature(libc)] -#![cfg_attr(not(stage0), feature(nll))] +#![feature(nll)] #![feature(panic_runtime)] #![feature(staged_api)] #![feature(rustc_attrs)] // 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. -#[cfg_attr(stage0, no_mangle)] #[rustc_std_internal_symbol] pub unsafe extern fn __rust_maybe_catch_panic(f: fn(*mut u8), data: *mut u8, @@ -51,7 +50,6 @@ pub unsafe extern fn __rust_maybe_catch_panic(f: fn(*mut u8), // which would break compat with XP. For now just use `intrinsics::abort` which // will kill us with an illegal instruction, which will do a good enough job for // now hopefully. -#[cfg_attr(stage0, no_mangle)] #[rustc_std_internal_symbol] pub unsafe extern fn __rust_start_panic(_payload: usize) -> u32 { abort(); |