Skip to content

Commit 7520ea9

Browse files
author
hyd-dev
committed
Use C-unwind ABI for __rust_start_panic in panic_abort
1 parent d4ad1cf commit 7520ea9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

library/panic_abort/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#![feature(staged_api)]
1616
#![feature(rustc_attrs)]
1717
#![feature(asm)]
18+
#![feature(c_unwind)]
1819

1920
#[cfg(target_os = "android")]
2021
mod android;
@@ -30,7 +31,7 @@ pub unsafe extern "C" fn __rust_panic_cleanup(_: *mut u8) -> *mut (dyn Any + Sen
3031

3132
// "Leak" the payload and shim to the relevant abort on the platform in question.
3233
#[rustc_std_internal_symbol]
33-
pub unsafe extern "C" fn __rust_start_panic(_payload: *mut &mut dyn BoxMeUp) -> u32 {
34+
pub unsafe extern "C-unwind" fn __rust_start_panic(_payload: *mut &mut dyn BoxMeUp) -> u32 {
3435
// Android has the ability to attach a message as part of the abort.
3536
#[cfg(target_os = "android")]
3637
android::android_set_abort_message(_payload);

0 commit comments

Comments
 (0)