Changeset View
Changeset View
Standalone View
Standalone View
lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs
| --- vendor/backtrace/src/backtrace/libunwind.rs.orig 2019-01-16 11:06:07 UTC | --- vendor/backtrace/src/backtrace/libunwind.rs.orig 2019-04-08 14:18:22 UTC | ||||
| +++ vendor/backtrace/src/backtrace/libunwind.rs | +++ vendor/backtrace/src/backtrace/libunwind.rs | ||||
| @@ -115,12 +115,14 @@ mod uw { | @@ -113,12 +113,14 @@ mod uw { | ||||
| // available since GCC 4.2.0, should be fine for our purpose | // available since GCC 4.2.0, should be fine for our purpose | ||||
| #[cfg(all(not(all(target_os = "android", target_arch = "arm")), | #[cfg(all(not(all(target_os = "android", target_arch = "arm")), | ||||
| + not(all(target_os = "freebsd", target_arch = "arm")), | + not(all(target_os = "freebsd", target_arch = "arm")), | ||||
| not(all(target_os = "linux", target_arch = "arm"))))] | not(all(target_os = "linux", target_arch = "arm"))))] | ||||
| pub fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context, | pub fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context, | ||||
| ip_before_insn: *mut c_int) | ip_before_insn: *mut c_int) | ||||
| -> libc::uintptr_t; | -> libc::uintptr_t; | ||||
| #[cfg(all(not(target_os = "android"), | #[cfg(all(not(target_os = "android"), | ||||
| + not(all(target_os = "freebsd", target_arch = "arm")), | + not(all(target_os = "freebsd", target_arch = "arm")), | ||||
| not(all(target_os = "linux", target_arch = "arm"))))] | not(all(target_os = "linux", target_arch = "arm"))))] | ||||
| pub fn _Unwind_FindEnclosingFunction(pc: *mut c_void) | pub fn _Unwind_FindEnclosingFunction(pc: *mut c_void) | ||||
| -> *mut c_void; | -> *mut c_void; | ||||
| @@ -130,6 +132,7 @@ mod uw { | @@ -128,6 +130,7 @@ mod uw { | ||||
| // expansion of the macro. This is all copy/pasted directly from the | // expansion of the macro. This is all copy/pasted directly from the | ||||
| // header file with the definition of _Unwind_GetIP. | // header file with the definition of _Unwind_GetIP. | ||||
| #[cfg(any(all(target_os = "android", target_arch = "arm"), | #[cfg(any(all(target_os = "android", target_arch = "arm"), | ||||
| + all(target_os = "freebsd", target_arch = "arm"), | + all(target_os = "freebsd", target_arch = "arm"), | ||||
| all(target_os = "linux", target_arch = "arm")))] | all(target_os = "linux", target_arch = "arm")))] | ||||
| pub unsafe fn _Unwind_GetIP(ctx: *mut _Unwind_Context) -> libc::uintptr_t { | pub unsafe fn _Unwind_GetIP(ctx: *mut _Unwind_Context) -> libc::uintptr_t { | ||||
| #[repr(C)] | #[repr(C)] | ||||
| @@ -177,6 +180,7 @@ mod uw { | @@ -175,6 +178,7 @@ mod uw { | ||||
| // This function doesn't exist on Android or ARM/Linux, so make it same | // This function doesn't exist on Android or ARM/Linux, so make it same | ||||
| // to _Unwind_GetIP | // to _Unwind_GetIP | ||||
| #[cfg(any(all(target_os = "android", target_arch = "arm"), | #[cfg(any(all(target_os = "android", target_arch = "arm"), | ||||
| + all(target_os = "freebsd", target_arch = "arm"), | + all(target_os = "freebsd", target_arch = "arm"), | ||||
| all(target_os = "linux", target_arch = "arm")))] | all(target_os = "linux", target_arch = "arm")))] | ||||
| pub unsafe fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context, | pub unsafe fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context, | ||||
| ip_before_insn: *mut c_int) | ip_before_insn: *mut c_int) | ||||
| @@ -189,6 +193,7 @@ mod uw { | @@ -187,6 +191,7 @@ mod uw { | ||||
| // This function also doesn't exist on Android or ARM/Linux, so make it | // This function also doesn't exist on Android or ARM/Linux, so make it | ||||
| // a no-op | // a no-op | ||||
| #[cfg(any(target_os = "android", | #[cfg(any(target_os = "android", | ||||
| + all(target_os = "freebsd", target_arch = "arm"), | + all(target_os = "freebsd", target_arch = "arm"), | ||||
| all(target_os = "linux", target_arch = "arm")))] | all(target_os = "linux", target_arch = "arm")))] | ||||
| pub unsafe fn _Unwind_FindEnclosingFunction(pc: *mut c_void) | pub unsafe fn _Unwind_FindEnclosingFunction(pc: *mut c_void) | ||||
| -> *mut c_void | -> *mut c_void | ||||