diff options
| author | bors <bors@rust-lang.org> | 2020-04-26 15:48:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-26 15:48:58 +0000 |
| commit | 7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f (patch) | |
| tree | 473644e3095ec29d92b0c68880f49599c402cbfa /src/rustllvm/PassWrapper.cpp | |
| parent | ec1f28f9614292c36b371d3758afffdd52cb9786 (diff) | |
| parent | aa9dc6952235a58d4c37b63bed15992f5225fbf0 (diff) | |
| download | rust-7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f.tar.gz rust-7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f.zip | |
Auto merge of #71579 - Dylan-DPC:rollup-h9om2g3, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #71490 (Cleanup and document `-C relocation-model`) - #71562 (fix more clippy warnings) - #71571 (Fix since attribute for nonzero_bitor impl's) - #71574 (proc_macro: Fix since attributes for new Span methods) - #71575 (Fix stable(since) attribute for BTreeMap::remove_entry) Failed merges: r? @ghost
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index b221c17b422..e31dd77d8af 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -346,8 +346,7 @@ static PassBuilder::OptimizationLevel fromRust(LLVMRustPassBuilderOptLevel Level } } -enum class LLVMRustRelocMode { - Default, +enum class LLVMRustRelocModel { Static, PIC, DynamicNoPic, @@ -356,21 +355,19 @@ enum class LLVMRustRelocMode { ROPIRWPI, }; -static Optional<Reloc::Model> fromRust(LLVMRustRelocMode RustReloc) { +static Reloc::Model fromRust(LLVMRustRelocModel RustReloc) { switch (RustReloc) { - case LLVMRustRelocMode::Default: - return None; - case LLVMRustRelocMode::Static: + case LLVMRustRelocModel::Static: return Reloc::Static; - case LLVMRustRelocMode::PIC: + case LLVMRustRelocModel::PIC: return Reloc::PIC_; - case LLVMRustRelocMode::DynamicNoPic: + case LLVMRustRelocModel::DynamicNoPic: return Reloc::DynamicNoPIC; - case LLVMRustRelocMode::ROPI: + case LLVMRustRelocModel::ROPI: return Reloc::ROPI; - case LLVMRustRelocMode::RWPI: + case LLVMRustRelocModel::RWPI: return Reloc::RWPI; - case LLVMRustRelocMode::ROPIRWPI: + case LLVMRustRelocModel::ROPIRWPI: return Reloc::ROPI_RWPI; } report_fatal_error("Bad RelocModel."); @@ -440,7 +437,7 @@ extern "C" const char* LLVMRustGetHostCPUName(size_t *len) { extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine( const char *TripleStr, const char *CPU, const char *Feature, - const char *ABIStr, LLVMRustCodeModel RustCM, LLVMRustRelocMode RustReloc, + const char *ABIStr, LLVMRustCodeModel RustCM, LLVMRustRelocModel RustReloc, LLVMRustCodeGenOptLevel RustOptLevel, bool UseSoftFloat, bool PositionIndependentExecutable, bool FunctionSections, bool DataSections, |