diff options
| author | Matthew Maurer <mmaurer@google.com> | 2023-10-12 17:36:01 +0000 |
|---|---|---|
| committer | Nikita Popov <npopov@redhat.com> | 2024-01-19 10:52:01 +0100 |
| commit | dbff90c2a7c751cf9d6843cd585429beb100c17d (patch) | |
| tree | bd0aa2e918e2761320771fa7aafce83501f7a808 /compiler/rustc_codegen_llvm/src | |
| parent | 16fadb3f252bcfc5ee3f0be09472c9600a052202 (diff) | |
| download | rust-dbff90c2a7c751cf9d6843cd585429beb100c17d.tar.gz rust-dbff90c2a7c751cf9d6843cd585429beb100c17d.zip | |
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 alignment change was discussed in rust-lang/compiler-team#683 See #54341 for additional information about why this is happening and where this will be useful in the future. This *does not* stabilize `i128`/`u128` for FFI.
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 { |
