]> git.lizzy.rs Git - rust.git/commitdiff
Merge branch 'master' into sync_from_rust2
authorAntoni Boucher <bouanto@zoho.com>
Tue, 7 Jun 2022 00:57:25 +0000 (20:57 -0400)
committerAntoni Boucher <bouanto@zoho.com>
Tue, 7 Jun 2022 00:57:25 +0000 (20:57 -0400)
1  2 
rustup.sh
src/asm.rs
src/builder.rs
src/common.rs
src/consts.rs
src/context.rs
src/intrinsic/mod.rs
src/intrinsic/simd.rs
src/lib.rs
src/type_of.rs

diff --cc rustup.sh
Simple merge
diff --cc src/asm.rs
index 20d91b80e8c52821904c449c572e2fa681225c8c,738c990fa827f622779784230d9e962729629e1c..52fd66af0659d624384ed5a924521d9d771658b9
@@@ -588,11 -595,10 +603,11 @@@ fn reg_to_gcc(reg: InlineAsmRegOrRegCla
              InlineAsmRegClass::X86(X86InlineAsmRegClass::xmm_reg)
              | InlineAsmRegClass::X86(X86InlineAsmRegClass::ymm_reg) => "x",
              InlineAsmRegClass::X86(X86InlineAsmRegClass::zmm_reg) => "v",
-             InlineAsmRegClass::X86(X86InlineAsmRegClass::kreg) => unimplemented!(),
+             InlineAsmRegClass::X86(X86InlineAsmRegClass::kreg) => "Yk",
 +            InlineAsmRegClass::X86(X86InlineAsmRegClass::kreg0) => unimplemented!(),
              InlineAsmRegClass::Wasm(WasmInlineAsmRegClass::local) => unimplemented!(),
              InlineAsmRegClass::X86(
 -                X86InlineAsmRegClass::x87_reg | X86InlineAsmRegClass::mmx_reg,
 +                X86InlineAsmRegClass::x87_reg | X86InlineAsmRegClass::mmx_reg | X86InlineAsmRegClass::tmm_reg,
              ) => unreachable!("clobber-only"),
              InlineAsmRegClass::SpirV(SpirVInlineAsmRegClass::reg) => {
                  bug!("GCC backend does not support SPIR-V")
diff --cc src/builder.rs
Simple merge
diff --cc src/common.rs
Simple merge
diff --cc src/consts.rs
Simple merge
diff --cc src/context.rs
Simple merge
Simple merge
Simple merge
diff --cc src/lib.rs
Simple merge
diff --cc src/type_of.rs
Simple merge