Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ce04288

Browse files
committedMay 8, 2023
Auto merge of rust-lang#111346 - JohnTitor:rollup-6g5cg9z, r=JohnTitor
Rollup of 7 pull requests Successful merges: - rust-lang#105354 (Add deployment-target --print flag for Apple targets) - rust-lang#110377 (Update max_atomic_width of armv7r and armv7_sony_vita targets to 64.) - rust-lang#110638 (STD support for PSVita) - rust-lang#111211 (Don't compute trait super bounds unless they're positive) - rust-lang#111315 (Remove `identity_future` from stdlib) - rust-lang#111331 (Mark s390x condition code register as clobbered in inline assembly) - rust-lang#111332 (Improve inline asm for LoongArch) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents c86e7fb + 2a8adcc commit ce04288

File tree

43 files changed

+455
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+455
-82
lines changed
 

‎Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,9 +1938,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
19381938

19391939
[[package]]
19401940
name = "libc"
1941-
version = "0.2.142"
1941+
version = "0.2.143"
19421942
source = "registry+https://github.com/rust-lang/crates.io-index"
1943-
checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
1943+
checksum = "edc207893e85c5d6be840e969b496b53d94cec8be2d501b214f50daa97fa8024"
19441944
dependencies = [
19451945
"rustc-std-workspace-core",
19461946
]

‎compiler/rustc_codegen_llvm/src/asm.rs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,22 @@ impl<'ll, 'tcx> AsmBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> {
236236
InlineAsmArch::Nvptx64 => {}
237237
InlineAsmArch::PowerPC | InlineAsmArch::PowerPC64 => {}
238238
InlineAsmArch::Hexagon => {}
239-
InlineAsmArch::LoongArch64 => {}
239+
InlineAsmArch::LoongArch64 => {
240+
constraints.extend_from_slice(&[
241+
"~{$fcc0}".to_string(),
242+
"~{$fcc1}".to_string(),
243+
"~{$fcc2}".to_string(),
244+
"~{$fcc3}".to_string(),
245+
"~{$fcc4}".to_string(),
246+
"~{$fcc5}".to_string(),
247+
"~{$fcc6}".to_string(),
248+
"~{$fcc7}".to_string(),
249+
]);
250+
}
240251
InlineAsmArch::Mips | InlineAsmArch::Mips64 => {}
241-
InlineAsmArch::S390x => {}
252+
InlineAsmArch::S390x => {
253+
constraints.push("~{cc}".to_string());
254+
}
242255
InlineAsmArch::SpirV => {}
243256
InlineAsmArch::Wasm32 | InlineAsmArch::Wasm64 => {}
244257
InlineAsmArch::Bpf => {}

0 commit comments

Comments
 (0)
Please sign in to comment.