diff options
| author | bors <bors@rust-lang.org> | 2022-08-16 05:13:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-16 05:13:38 +0000 |
| commit | 8556e6620e4866526b3cea767ad8c20ae877a569 (patch) | |
| tree | 13d9f9ec09bd402a73d9e1e01f5b6bef7f486544 /compiler/rustc_codegen_llvm/src/context.rs | |
| parent | ef9810a3e2a9a16e79176cb0d3466ea82d239942 (diff) | |
| parent | 88af506e948d3a5e1aca5fe68a2d926d7cabefdd (diff) | |
| download | rust-8556e6620e4866526b3cea767ad8c20ae877a569.tar.gz rust-8556e6620e4866526b3cea767ad8c20ae877a569.zip | |
Auto merge of #100611 - matthiaskrgr:rollup-rxj10ur, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #100338 (when there are 3 or more return statements in the loop) - #100384 (Add support for generating unique profraw files by default when using `-C instrument-coverage`) - #100460 (Update the minimum external LLVM to 13) - #100567 (Add missing closing quote) - #100590 (Suggest adding an array length if possible) - #100600 (Rename Machine memory hooks to suggest when they run) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/context.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index 5857b83f6c9..d4d84147239 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -142,17 +142,6 @@ pub unsafe fn create_module<'ll>( let mut target_data_layout = sess.target.data_layout.to_string(); let llvm_version = llvm_util::get_version(); - if llvm_version < (13, 0, 0) { - if sess.target.arch == "powerpc64" { - target_data_layout = target_data_layout.replace("-S128", ""); - } - if sess.target.arch == "wasm32" { - target_data_layout = "e-m:e-p:32:32-i64:64-n32:64-S128".to_string(); - } - if sess.target.arch == "wasm64" { - target_data_layout = "e-m:e-p:64:64-i64:64-n32:64-S128".to_string(); - } - } if llvm_version < (14, 0, 0) { if sess.target.llvm_target == "i686-pc-windows-msvc" || sess.target.llvm_target == "i586-pc-windows-msvc" |