Skip to content

Commit

Permalink
Rollup merge of rust-lang#43228 - redox-os:backtrace_fix, r=alexcrichton
Browse files Browse the repository at this point in the history
Fix backtrace on Redox

This fixes sys::backtrace on Redox
  • Loading branch information
frewsxcv authored Jul 15, 2017
2 parents 877e62e + 5757e05 commit 57bc82d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
15 changes: 12 additions & 3 deletions src/libstd/sys/redox/backtrace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,25 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use libc;
use io;
use sys_common::backtrace::Frame;

pub use sys_common::gnu::libbacktrace::*;
pub use sys_common::gnu::libbacktrace::{foreach_symbol_fileline, resolve_symname};
pub struct BacktraceContext;

#[inline(never)]
pub fn unwind_backtrace(frames: &mut [Frame])
pub fn unwind_backtrace(_frames: &mut [Frame])
-> io::Result<(usize, BacktraceContext)>
{
Ok((0, BacktraceContext))
}

pub mod gnu {
use io;
use fs;
use libc::c_char;

pub fn get_executable_filename() -> io::Result<(Vec<c_char>, fs::File)> {
Err(io::Error::new(io::ErrorKind::Other, "Not implemented"))
}
}
3 changes: 2 additions & 1 deletion src/libstd/sys_common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ pub mod net;

#[cfg(feature = "backtrace")]
#[cfg(any(all(unix, not(any(target_os = "macos", target_os = "ios", target_os = "emscripten"))),
all(windows, target_env = "gnu")))]
all(windows, target_env = "gnu"),
target_os = "redox"))]
pub mod gnu;

// common error constructors
Expand Down

0 comments on commit 57bc82d

Please sign in to comment.