diff options
| author | bors <bors@rust-lang.org> | 2020-05-09 17:31:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-09 17:31:08 +0000 |
| commit | bad3bf622bded50a97c0a54e29350eada2a3a169 (patch) | |
| tree | 0cfa645b6a4e35b9c1bd6d435f44ecc1f4e2ed19 /src/rustllvm/PassWrapper.cpp | |
| parent | 7c59a81a5fcbaaca311f744cd7c68d99bfbb05d3 (diff) | |
| parent | 366c1786e61d14a89cebd354b78ce6a68202b699 (diff) | |
| download | rust-bad3bf622bded50a97c0a54e29350eada2a3a169.tar.gz rust-bad3bf622bded50a97c0a54e29350eada2a3a169.zip | |
Auto merge of #72041 - RalfJung:rollup-xivrvy2, r=RalfJung
Rollup of 5 pull requests
Successful merges:
- #69406 (upgrade chalk and use chalk-solve/chalk-ir/chalk-rust-ir)
- #71185 (Move tests from `test/run-fail` to UI)
- #71234 (rustllvm: Use .init_array rather than .ctors)
- #71508 (Simplify the `tcx.alloc_map` API)
- #71555 (Remove ast::{Ident, Name} reexports.)
Failed merges:
r? @ghost
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index e1d75418243..84bde9a52f7 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -447,7 +447,8 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine( bool Singlethread, bool AsmComments, bool EmitStackSizeSection, - bool RelaxELFRelocations) { + bool RelaxELFRelocations, + bool UseInitArray) { auto OptLevel = fromRust(RustOptLevel); auto RM = fromRust(RustReloc); @@ -473,6 +474,7 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine( Options.MCOptions.PreserveAsmComments = AsmComments; Options.MCOptions.ABIName = ABIStr; Options.RelaxELFRelocations = RelaxELFRelocations; + Options.UseInitArray = UseInitArray; if (TrapUnreachable) { // Tell LLVM to codegen `unreachable` into an explicit trap instruction. |