Update avr layout

Author: tomtor

compiler/rustc_codegen_llvm/src/context.rs

@@ -215,8 +215,8 @@ pub(crate) unsafe fn create_module<'ll>(
     }
     if llvm_version < (22, 0, 0) {
         if sess.target.arch == "avr" {
-            // LLVM 22.0 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")
+            // LLVM 22.0 updated the default layout on avr: https://github.com/llvm/llvm-project/pull/153010
+            target_data_layout = target_data_layout.replace("n8:16", "n8")
         }
     }
 

compiler/rustc_target/src/spec/targets/avr_none.rs

@@ -9,7 +9,7 @@ pub(crate) fn target() -> Target {
             host_tools: None,
             std: None,
         },
-        data_layout: "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-n16:8-a:8".into(),
+        data_layout: "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8:16-a:8".into(),
         llvm_target: "avr-unknown-unknown".into(),
         pointer_width: 16,
         options: TargetOptions {