diff options
| author | bors <bors@rust-lang.org> | 2022-09-30 10:39:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-30 10:39:09 +0000 |
| commit | f914b82a754c6d85c0a909ab152f5b611defef73 (patch) | |
| tree | 4aadd6df5dcdf3bea8a2cbd16bf91fb0e2753c92 /compiler/rustc_codegen_llvm/src | |
| parent | 4a0ee3cdc66573c8b46471462db7088a89d25183 (diff) | |
| parent | 588a25a6f8bfeec3a6bb8d8f498b0ed0794f7096 (diff) | |
| download | rust-f914b82a754c6d85c0a909ab152f5b611defef73.tar.gz rust-f914b82a754c6d85c0a909ab152f5b611defef73.zip | |
Auto merge of #102509 - matthiaskrgr:rollup-gtenet8, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #101075 (Migrate rustc_codegen_gcc to SessionDiagnostics )
- #102350 (Improve errors for incomplete functions in struct definitions)
- #102481 (rustdoc: remove unneeded CSS `.rust-example-rendered { position }`)
- #102491 (rustdoc: remove no-op source sidebar `opacity`)
- #102499 (Adjust the s390x data layout for LLVM 16)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -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 67ffc7cb951..2ab69d25411 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -154,6 +154,11 @@ pub unsafe fn create_module<'ll>( target_data_layout = target_data_layout.replace("-p10:8:8-p20:8:8", ""); } } + if llvm_version < (16, 0, 0) { + if sess.target.arch == "s390x" { + target_data_layout = target_data_layout.replace("-v128:64", ""); + } + } // Ensure the data-layout values hardcoded remain the defaults. if sess.target.is_builtin { |