bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

NetBSD on EABI ARM does not use ARM EHABI

Browse source
This commit is contained in:
Jonathan A. Kollasch 2018-05-18 09:26:53 -05:00
parent df40e61382
commit 32f9b53ed8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libpanic_unwind/gcc.rs
View file

@ -143,7 +143,7 @@ const UNWIND_DATA_REG: (i32, i32) = (24, 25); // I0, I1
// The personality routine for most of our targets, except ARM, which has a slightly different ABI // The personality routine for most of our targets, except ARM, which has a slightly different ABI
// (however, iOS goes here as it uses SjLj unwinding). Also, the 64-bit Windows implementation // (however, iOS goes here as it uses SjLj unwinding). Also, the 64-bit Windows implementation
// lives in seh64_gnu.rs // lives in seh64_gnu.rs
#[cfg(all(any(target_os = "ios", not(target_arch = "arm"))))] #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm"))))]
#[lang = "eh_personality"] #[lang = "eh_personality"]
#[no_mangle] #[no_mangle]
#[allow(unused)] #[allow(unused)]
@ -184,7 +184,7 @@ unsafe extern "C" fn rust_eh_personality(version: c_int,
// ARM EHABI personality routine. // ARM EHABI personality routine.
// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0038b/IHI0038B_ehabi.pdf // http://infocenter.arm.com/help/topic/com.arm.doc.ihi0038b/IHI0038B_ehabi.pdf
#[cfg(all(target_arch = "arm", not(target_os = "ios")))] #[cfg(all(target_arch = "arm", not(target_os = "ios"), not(target_os = "netbsd")))]
#[lang = "eh_personality"] #[lang = "eh_personality"]
#[no_mangle] #[no_mangle]
unsafe extern "C" fn rust_eh_personality(state: uw::_Unwind_State, unsafe extern "C" fn rust_eh_personality(state: uw::_Unwind_State,

2
src/libunwind/libunwind.rs
View file

@ -93,7 +93,7 @@ extern "C" {
} }
cfg_if! { cfg_if! {
if #[cfg(all(any(target_os = "ios", not(target_arch = "arm"))))] { if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm"))))] {
// Not ARM EHABI // Not ARM EHABI
#[repr(C)] #[repr(C)]
#[derive(Copy, Clone, PartialEq)] #[derive(Copy, Clone, PartialEq)]