diff options
| author | Ralf Jung <post@ralfj.de> | 2025-02-16 08:38:29 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2025-02-16 08:38:29 +0100 |
| commit | 703154d4f0db2754493c2f5a464d389377dc0dd2 (patch) | |
| tree | 042be607aed8e214e257b43911b93b9b142adddc /compiler/rustc_codegen_llvm/src | |
| parent | acdf9133aca8c5684a7c16f0c7fa0a72cac6a4a3 (diff) | |
| parent | d0e7bfd2056cffc7ea0e5f7ed577e987a627ba04 (diff) | |
| download | rust-703154d4f0db2754493c2f5a464d389377dc0dd2.tar.gz rust-703154d4f0db2754493c2f5a464d389377dc0dd2.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index 7fe527a4c07..e7952bc95e7 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -194,6 +194,12 @@ pub(crate) unsafe fn create_module<'ll>( target_data_layout = target_data_layout.replace("-i128:128", ""); } } + if llvm_version < (21, 0, 0) { + if sess.target.arch == "nvptx64" { + // LLVM 21 updated the default layout on nvptx: https://github.com/llvm/llvm-project/pull/124961 + target_data_layout = target_data_layout.replace("e-p6:32:32-i64", "e-i64"); + } + } // Ensure the data-layout values hardcoded remain the defaults. { |