diff options
| author | bors <bors@rust-lang.org> | 2015-11-20 03:26:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-20 03:26:19 +0000 |
| commit | e5c69b10c33990c14a239cf53d25763013dc84a4 (patch) | |
| tree | 10c052b7bccaff94ace93d72977cd8f04a1bf0ba | |
| parent | bce743ca0ac3c891ce16a2aaa61f7e3a19fa488c (diff) | |
| parent | 99741700e54ce98c12eb754b60917de21c75c2f4 (diff) | |
| download | rust-e5c69b10c33990c14a239cf53d25763013dc84a4.tar.gz rust-e5c69b10c33990c14a239cf53d25763013dc84a4.zip | |
Auto merge of #29942 - brson:rmsegstack, r=alexcrichton
| -rw-r--r-- | src/librustc_llvm/lib.rs | 1 | ||||
| -rw-r--r-- | src/librustc_trans/back/write.rs | 1 | ||||
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs index 9cb5012cf0f..0cb0869db86 100644 --- 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 index 17c8d9aa9e1..1a4007026fb 100644 --- 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 index b27a622136f..30096677aa4 100644 --- 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, |