Change context to LLVM < 21.2

tomtor · tomtor · commit e071fd0a65f2 · 2025-08-11T16:00:57.000+02:00
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs
@@ -213,6 +213,12 @@ pub(crate) unsafe fn create_module<'ll>(
             target_data_layout = target_data_layout.replace("p8:128:128:128:48", "p8:128:128")
         }
     }
+    if llvm_version < (21, 2, 0) {
+        if sess.target.arch == "avr" {
+            // LLVM 21.2 updated the default layout on avr: https://github.com/llvm/llvm-project/pull/152028
+            target_data_layout = target_data_layout.replace("n8-n16:8", "n8")
+        }
+    }
 
     // Ensure the data-layout values hardcoded remain the defaults.
     {

Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,12 @@ pub(crate) unsafe fn create_module<'ll>(`
`213`	`213`	`target_data_layout = target_data_layout.replace("p8:128:128:128:48", "p8:128:128")`
`214`	`214`	`}`
`215`	`215`	`}`
	`216`	`+ if llvm_version < (21, 2, 0) {`
	`217`	`+ if sess.target.arch == "avr" {`
	`218`	`+ // LLVM 21.2 updated the default layout on avr: https://github.com/llvm/llvm-project/pull/152028`
	`219`	`+ target_data_layout = target_data_layout.replace("n8-n16:8", "n8")`
	`220`	`+ }`
	`221`	`+ }`
`216`	`222`
`217`	`223`	`// Ensure the data-layout values hardcoded remain the defaults.`
`218`	`224`	`{`