Fix stage0 ICE caused by the old _Unwind_Resume override trickery.

vadimcn · vadimcn · commit 0332ee9f6336 · 2015-10-31T18:52:37.000-07:00
diff --git a/src/libstd/sys/common/libunwind.rs b/src/libstd/sys/common/libunwind.rs
@@ -131,6 +131,8 @@ extern "C" {
 
     pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception);
 
+    // remove cfg after new snapshot
+    #[cfg(not(all(stage0, target_os="windows", target_arch="x86_64")))]
     #[unwind]
     pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !;
 }

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,8 @@ extern "C" {`
`131`	`131`
`132`	`132`	`pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception);`
`133`	`133`
	`134`	`+ // remove cfg after new snapshot`
	`135`	`+ #[cfg(not(all(stage0, target_os="windows", target_arch="x86_64")))]`
`134`	`136`	`#[unwind]`
`135`	`137`	`pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !;`
`136`	`138`	`}`