bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix tests on ARM Linux (#3)

Browse source
This commit is contained in:
Vadim Petrochenkov 2017-02-25 17:18:17 +03:00 • committed by Yamakaky
parent 0982a28304
commit 53a5d56435
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/sys/unix/backtrace/tracing/gcc_s.rs
View file

@ -53,7 +53,9 @@ pub fn unwind_backtrace(frames: &mut [Frame])
// See libunwind:src/unwind/Backtrace.c for the return values. // See libunwind:src/unwind/Backtrace.c for the return values.
// No, there is no doc. // No, there is no doc.
match result_unwind { match result_unwind {
uw::_URC_END_OF_STACK | uw::_URC_FATAL_PHASE1_ERROR => { // These return codes seem to be benign and need to be ignored for backtraces
// to show up properly on all tested platforms.
uw::_URC_END_OF_STACK | uw::_URC_FATAL_PHASE1_ERROR | uw::_URC_FAILURE => {
Ok((cx.idx, BacktraceContext)) Ok((cx.idx, BacktraceContext))
} }
_ => { _ => {

1
src/libstd/sys_common/backtrace.rs
View file

@ -134,6 +134,7 @@ fn filter_frames(frames: &[Frame],
"__libc_start_main", "__libc_start_main",
"__rust_try", "__rust_try",
"_start", "_start",
"main",
"BaseThreadInitThunk", "BaseThreadInitThunk",
"__scrt_common_main_seh", "__scrt_common_main_seh",
"_ZN4drop", "_ZN4drop",