Auto merge of #132965 - mati865:cfguard-gnullvm, r=wesleywiser

allow CFGuard on windows-gnullvm No unit tests because of #132278
rust-lang · Nov 15, 2024 · 3bc6916 · 3bc6916
2 parents e84902d + 811c1db
commit 3bc6916
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs
@@ -274,8 +274,12 @@ pub(crate) unsafe fn create_module<'ll>(
         }
     }
 
-    // Control Flow Guard is currently only supported by the MSVC linker on Windows.
-    if sess.target.is_like_msvc {
+    // Control Flow Guard is currently only supported by MSVC and LLVM on Windows.
+    if sess.target.is_like_msvc
+        || (sess.target.options.os == "windows"
+            && sess.target.options.env == "gnu"
+            && sess.target.options.abi == "llvm")
+    {
         match sess.opts.cg.control_flow_guard {
             CFGuard::Disabled => {}
             CFGuard::NoChecks => {