mirror of https://github.com/rust-lang/rust.git
Rollup merge of #43228 - redox-os:backtrace_fix, r=alexcrichton
Fix backtrace on Redox This fixes sys::backtrace on Redox
This commit is contained in:
commit
57bc82d637
|
@ -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"))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue