rustc: Turn off split stacks on Windows

brson · brson · commit 91e30ecf6774 · 2014-09-26T10:16:56.000-07:00
diff --git a/src/librustc/middle/trans/context.rs b/src/librustc/middle/trans/context.rs
@@ -546,7 +546,7 @@ impl<'b, 'tcx> CrateContext<'b, 'tcx> {
     // but it could be enabled (with patched LLVM)
     pub fn is_split_stack_supported(&self) -> bool {
         let ref cfg = self.sess().targ_cfg;
-        cfg.os != abi::OsiOS || cfg.arch != abi::Arm
+        (cfg.os != abi::OsiOS || cfg.arch != abi::Arm) && cfg.os != abi::OsWindows
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ impl<'b, 'tcx> CrateContext<'b, 'tcx> {`
`546`	`546`	`// but it could be enabled (with patched LLVM)`
`547`	`547`	`pub fn is_split_stack_supported(&self) -> bool {`
`548`	`548`	`let ref cfg = self.sess().targ_cfg;`
`549`		`- cfg.os != abi::OsiOS \|\| cfg.arch != abi::Arm`
	`549`	`+ (cfg.os != abi::OsiOS \|\| cfg.arch != abi::Arm) && cfg.os != abi::OsWindows`
`550`	`550`	`}`
`551`	`551`
`552`	`552`