diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-07 11:14:10 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-08 09:50:20 +0000 |
| commit | 91e5bd87e6ef2a3320bf610cb7cc2e2d64d7606f (patch) | |
| tree | d130a3ce656e6b866bf9a07a1c8d79ae98853f43 | |
| parent | 07147f34d0691a0709b0e1f5ef62c8029d2da58d (diff) | |
| download | rust-91e5bd87e6ef2a3320bf610cb7cc2e2d64d7606f.tar.gz rust-91e5bd87e6ef2a3320bf610cb7cc2e2d64d7606f.zip | |
Skip cpuid shim when inline asm support is enabled
cg_clif should support enough simd intrinsics now to not need almost all cpu features to be force disabled. In addition they can't be disabled anyway when using a sysroot compiled by LLVM.
| -rw-r--r-- | src/inline_asm.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/inline_asm.rs b/src/inline_asm.rs index a993c5edab1..dd2127d554d 100644 --- a/src/inline_asm.rs +++ b/src/inline_asm.rs @@ -44,7 +44,9 @@ pub(crate) fn codegen_inline_asm<'tcx>( ) { // FIXME add .eh_frame unwind info directives - if !template.is_empty() { + if !template.is_empty() + && (cfg!(not(feature = "inline_asm")) || fx.tcx.sess.target.is_like_windows) + { // Used by panic_abort if template[0] == InlineAsmTemplatePiece::String("int $$0x29".to_string()) { fx.bcx.ins().trap(TrapCode::User(1)); |