Auto merge of #29471 - pierzchalski:custom-target-custom-unwind-json, r=alexcrichton

2015-11-01 20:00:07 +00:00 · 2015-11-01 20:00:07 +00:00 · af6e413fdb
commit af6e413fdb
parent 71409184dc 054e409651
1 changed files with 1 additions and 0 deletions
--- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs
@ -346,6 +346,7 @@ impl Target {
        key!(pre_link_args, list);
        key!(post_link_args, list);
        key!(allow_asm, bool);
+        key!(custom_unwind_resume, bool);

        base
    }