mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #12922 : luqmana/rust/fix-arm, r=alexcrichton

Browse Source
This commit is contained in:
bors 2014-03-15 17:51:35 -07:00
commit de78d7f56c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/rt/libunwind.rs
View File

@ -120,7 +120,7 @@ pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn,
// of the macro. This is all copy/pasted directly from the header file with the
// definition of _Unwind_GetIP.
#[cfg(target_os = "android")]
#[cfg(target_os = "linux", target_os = "arm")]
#[cfg(target_os = "linux", target_arch = "arm")]
pub unsafe fn _Unwind_GetIP(ctx: *_Unwind_Context) -> libc::uintptr_t {
#[repr(C)]
enum _Unwind_VRS_Result {
@ -162,9 +162,9 @@ fn _Unwind_VRS_Get(ctx: *_Unwind_Context,
(val & !1) as libc::uintptr_t
}
// This function also doesn't exist on android, so make it a no-op
// This function also doesn't exist on android or arm/linux, so make it a no-op
#[cfg(target_os = "android")]
#[cfg(target_os = "linux", target_os = "arm")]
pub unsafe fn _Unwind_FindEnclosingFunction(pc: *libc::c_void) -> *libc::c_void{
#[cfg(target_os = "linux", target_arch = "arm")]
pub unsafe fn _Unwind_FindEnclosingFunction(pc: *libc::c_void) -> *libc::c_void {
pc
}