diff options
| author | bors <bors@rust-lang.org> | 2023-05-08 11:36:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-08 11:36:05 +0000 |
| commit | ce042889f7f0d687368a9704eff64cf9542bac6d (patch) | |
| tree | f1e5e514237175886f4d912961b4e4d7f2952395 /compiler/rustc_codegen_llvm/src | |
| parent | c86e7fb60f5343041fd0c27d4affaf3261115666 (diff) | |
| parent | 2a8adcc966f0c7ec75460d99ef6966fa4e3c7825 (diff) | |
| download | rust-ce042889f7f0d687368a9704eff64cf9542bac6d.tar.gz rust-ce042889f7f0d687368a9704eff64cf9542bac6d.zip | |
Auto merge of #111346 - JohnTitor:rollup-6g5cg9z, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #105354 (Add deployment-target --print flag for Apple targets) - #110377 (Update max_atomic_width of armv7r and armv7_sony_vita targets to 64.) - #110638 (STD support for PSVita) - #111211 (Don't compute trait super bounds unless they're positive) - #111315 (Remove `identity_future` from stdlib) - #111331 (Mark s390x condition code register as clobbered in inline assembly) - #111332 (Improve inline asm for LoongArch) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/asm.rs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/asm.rs b/compiler/rustc_codegen_llvm/src/asm.rs index f9af103c9ad..2a6ad1be763 100644 --- a/compiler/rustc_codegen_llvm/src/asm.rs +++ b/compiler/rustc_codegen_llvm/src/asm.rs @@ -236,9 +236,22 @@ impl<'ll, 'tcx> AsmBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> { InlineAsmArch::Nvptx64 => {} InlineAsmArch::PowerPC | InlineAsmArch::PowerPC64 => {} InlineAsmArch::Hexagon => {} - InlineAsmArch::LoongArch64 => {} + InlineAsmArch::LoongArch64 => { + constraints.extend_from_slice(&[ + "~{$fcc0}".to_string(), + "~{$fcc1}".to_string(), + "~{$fcc2}".to_string(), + "~{$fcc3}".to_string(), + "~{$fcc4}".to_string(), + "~{$fcc5}".to_string(), + "~{$fcc6}".to_string(), + "~{$fcc7}".to_string(), + ]); + } InlineAsmArch::Mips | InlineAsmArch::Mips64 => {} - InlineAsmArch::S390x => {} + InlineAsmArch::S390x => { + constraints.push("~{cc}".to_string()); + } InlineAsmArch::SpirV => {} InlineAsmArch::Wasm32 | InlineAsmArch::Wasm64 => {} InlineAsmArch::Bpf => {} |
