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

bors · bors · commit 3bc6916f4ca5 · 2024-11-15T00:21:07.000Z
allow CFGuard on windows-gnullvm No unit tests because of #132278
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 => {

Original file line number	Diff line number	Diff line change
`@@ -274,8 +274,12 @@ pub(crate) unsafe fn create_module<'ll>(`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`
`277`		`- // Control Flow Guard is currently only supported by the MSVC linker on Windows.`
`278`		`- if sess.target.is_like_msvc {`
	`277`	`+ // Control Flow Guard is currently only supported by MSVC and LLVM on Windows.`
	`278`	`+ if sess.target.is_like_msvc`
	`279`	`+ \|\| (sess.target.options.os == "windows"`
	`280`	`+ && sess.target.options.env == "gnu"`
	`281`	`+ && sess.target.options.abi == "llvm")`
	`282`	`+ {`
`279`	`283`	`match sess.opts.cg.control_flow_guard {`
`280`	`284`	`CFGuard::Disabled => {}`
`281`	`285`	`CFGuard::NoChecks => {`