Skip to content

Commit

Permalink
Auto merge of #43917 - ids1024:redox-unwind, r=alexcrichton
Browse files Browse the repository at this point in the history
Enable unwinding panics on Redox
  • Loading branch information
bors committed Aug 18, 2017
2 parents b8ce1a3 + 872f532 commit 230a379
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/librustc_back/target/redox_base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use {LinkerFlavor, PanicStrategy};
use LinkerFlavor;
use target::{LinkArgs, TargetOptions};
use std::default::Default;

Expand Down Expand Up @@ -37,7 +37,6 @@ pub fn opts() -> TargetOptions {
target_family: None,
linker_is_gnu: true,
has_elf_tls: true,
panic_strategy: PanicStrategy::Abort,
.. Default::default()
}
}

0 comments on commit 230a379

Please sign in to comment.