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

bors · bors · commit af6e413fdb1a · 2015-11-01T20:00:07.000Z
diff --git 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
     }

Original file line number	Diff line number	Diff line change
`@@ -346,6 +346,7 @@ impl Target {`
`346`	`346`	`key!(pre_link_args, list);`
`347`	`347`	`key!(post_link_args, list);`
`348`	`348`	`key!(allow_asm, bool);`
	`349`	`+ key!(custom_unwind_resume, bool);`
`349`	`350`
`350`	`351`	`base`
`351`	`352`	`}`