diff options
| author | bors <bors@rust-lang.org> | 2024-01-20 00:56:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-20 00:56:53 +0000 |
| commit | 0547c41f906760ce117a55ca690820b44d8e7eef (patch) | |
| tree | 004fb9e646df6dca7a0c23bd861731df3c78f268 /compiler/rustc_codegen_llvm/src | |
| parent | 88189a71e4e4376eea82ac61db6a539612eb200a (diff) | |
| parent | ec55a05374d89d206be5140a4759af92f1b42f15 (diff) | |
| download | rust-0547c41f906760ce117a55ca690820b44d8e7eef.tar.gz rust-0547c41f906760ce117a55ca690820b44d8e7eef.zip | |
Auto merge of #116672 - maurer:128-align, r=nikic
LLVM 18 x86 data layout update With https://reviews.llvm.org/D86310 LLVM now has i128 aligned to 16-bytes on x86 based platforms. This will be in LLVM-18. This patch updates all our spec targets to be 16-byte aligned, and removes the alignment when speaking to older LLVM. This results in Rust overaligning things relative to LLVM on older LLVMs. This implements MCP https://github.com/rust-lang/compiler-team/issues/683. See #54341
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index 1d1b6e6148d..f3b2caf9b80 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -145,6 +145,14 @@ pub unsafe fn create_module<'ll>( .replace("-Fi64", ""); } } + if llvm_version < (18, 0, 0) { + if sess.target.arch == "x86" || sess.target.arch == "x86_64" { + // LLVM 18 adjusts i128 to be 128-bit aligned on x86 variants. + // Earlier LLVMs leave this as default alignment, so remove it. + // See https://reviews.llvm.org/D86310 + target_data_layout = target_data_layout.replace("-i128:128", ""); + } + } // Ensure the data-layout values hardcoded remain the defaults. if sess.target.is_builtin { |