Auto merge of rust-lang#29942 - brson:rmsegstack, r=alexcrichton

bors · bors · commit e5c69b10c339 · 2015-11-20T03:26:19.000Z
diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs
@@ -2044,7 +2044,6 @@ extern {
                                        Model: CodeGenModel,
                                        Reloc: RelocMode,
                                        Level: CodeGenOptLevel,
-                                       EnableSegstk: bool,
                                        UseSoftFP: bool,
                                        PositionIndependentExecutable: bool,
                                        FunctionSections: bool,
diff --git a/src/librustc_trans/back/write.rs b/src/librustc_trans/back/write.rs
@@ -218,7 +218,6 @@ pub fn create_target_machine(sess: &Session) -> TargetMachineRef {
             code_model,
             reloc_model,
             opt_level,
-            true /* EnableSegstk */,
             use_softfp,
             !any_library && reloc_model == llvm::RelocPIC,
             ffunction_sections,
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
@@ -80,7 +80,6 @@ LLVMRustCreateTargetMachine(const char *triple,
                             CodeModel::Model CM,
                             Reloc::Model RM,
                             CodeGenOpt::Level OptLevel,
-                            bool EnableSegmentedStacks,
                             bool UseSoftFloat,
                             bool PositionIndependentExecutable,
                             bool FunctionSections,
