about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-08-18 15:11:46 +0000
committerbors <bors@rust-lang.org>2017-08-18 15:11:46 +0000
commit230a379a452e5a2bcdfd0a956b259e0a1d83b512 (patch)
treeadfac3329fb6d3adb29eb1009d5bd463de27d62c
parentb8ce1a3d2e4fe22034845e76b4b11d5b71aba43e (diff)
parent872f5326415dab6ea4ccb1a9b510ce584ca46dc6 (diff)
downloadrust-230a379a452e5a2bcdfd0a956b259e0a1d83b512.tar.gz
rust-230a379a452e5a2bcdfd0a956b259e0a1d83b512.zip
Auto merge of #43917 - ids1024:redox-unwind, r=alexcrichton
Enable unwinding panics on Redox
-rw-r--r--src/librustc_back/target/redox_base.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustc_back/target/redox_base.rs b/src/librustc_back/target/redox_base.rs
index 2eae0a12408..c7915d4de72 100644
--- a/src/librustc_back/target/redox_base.rs
+++ b/src/librustc_back/target/redox_base.rs
@@ -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;
 
@@ -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()
     }
 }