diff options
| author | Laurențiu Nicola <lnicola@dend.ro> | 2024-12-23 11:27:07 +0200 |
|---|---|---|
| committer | Laurențiu Nicola <lnicola@dend.ro> | 2024-12-23 11:27:07 +0200 |
| commit | 9420a0b11a5403af2d08f2a2b3ece9d331b538dd (patch) | |
| tree | 14d045ee9ceb0d2f0121f789571bb01dfd0dea6b /compiler/rustc_codegen_llvm/src/context.rs | |
| parent | 214134902f952ff8f1f2b24db6d3f6f531675742 (diff) | |
| parent | 0eca4dd3205a01dba4bd7b7c140ec370aff03440 (diff) | |
| download | rust-9420a0b11a5403af2d08f2a2b3ece9d331b538dd.tar.gz rust-9420a0b11a5403af2d08f2a2b3ece9d331b538dd.zip | |
Merge from rust-lang/rust
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/context.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index e0506c0c5fd..c602d99ff9d 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -164,6 +164,11 @@ pub(crate) unsafe fn create_module<'ll>( // See https://github.com/llvm/llvm-project/pull/118004 target_data_layout = target_data_layout.replace("-i128:128", ""); } + if sess.target.arch.starts_with("wasm32") || sess.target.arch.starts_with("wasm64") { + // LLVM 20 updates the wasm(32|64) layout to correctly align 128 bit integers to 128 bit. + // See https://github.com/llvm/llvm-project/pull/119204 + target_data_layout = target_data_layout.replace("-i128:128", ""); + } } // Ensure the data-layout values hardcoded remain the defaults. |