about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm/src
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-12-23 01:17:50 +0100
committerGitHub <noreply@github.com>2022-12-23 01:17:50 +0100
commit49287a4095cdbbfa7ebd2c99e51b0624de40b7c8 (patch)
tree65a8554f01be82263aa1d588ccdb33de8e06ece0 /compiler/rustc_codegen_llvm/src
parent3e58de240c2a2e9b71d93f2d9f2d0c7e82ab345a (diff)
parent0b3ffcbb0beed7bc0be168dadbff2904b85d3666 (diff)
downloadrust-49287a4095cdbbfa7ebd2c99e51b0624de40b7c8.tar.gz
rust-49287a4095cdbbfa7ebd2c99e51b0624de40b7c8.zip
Rollup merge of #106051 - jyn514:cranelift-std, r=bjorn3
Allow building std with cranelift

- Don't pass llvm-specific args when using cranelift
- Don't use `asm` in compiler_builtins when using cranelift

r? `@bjorn3` cc `@Mark-Simulacrum`
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
-rw-r--r--compiler/rustc_codegen_llvm/src/intrinsic.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/intrinsic.rs b/compiler/rustc_codegen_llvm/src/intrinsic.rs
index 907517bf6ce..1ce48f82e1c 100644
--- a/compiler/rustc_codegen_llvm/src/intrinsic.rs
+++ b/compiler/rustc_codegen_llvm/src/intrinsic.rs
@@ -567,7 +567,7 @@ fn codegen_msvc_try<'ll>(
         // module.
         //
         // When modifying, make sure that the type_name string exactly matches
-        // the one used in src/libpanic_unwind/seh.rs.
+        // the one used in library/panic_unwind/src/seh.rs.
         let type_info_vtable = bx.declare_global("??_7type_info@@6B@", bx.type_i8p());
         let type_name = bx.const_bytes(b"rust_panic\0");
         let type_info =