From c4c92b0476c5847c92a1b6c6d709207036c60e34 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Thu, 25 Jun 2026 10:52:05 -0700
Subject: [PATCH] link.Coff: update to latest `@bitCast` semantics

fixes invisible merge conflict
---
 src/link/Coff.zig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/link/Coff.zig b/src/link/Coff.zig
index ad156c5f417947a46ebdca801d27717ab3ca06ca..5706f124977684eccc28e379140335d912d946f0 100644
--- a/src/link/Coff.zig
+++ b/src/link/Coff.zig
@@ -1180,6 +1180,7 @@ pub const Reloc = extern struct {
         IA64: std.coff.IMAGE.REL.IA64,
         MIPS: std.coff.IMAGE.REL.MIPS,
         M32R: std.coff.IMAGE.REL.M32R,
+        u16: u16,
     };
 
     pub const Index = enum(u32) {
@@ -3787,7 +3788,7 @@ fn addRelocAssumeCapacity(
 
             // applyLocationRelocs updates `virtual_address`
             // flushSymbolTableIndex updates `symbol_table_index`
-            coff.targetStore(&entry.type, @bitCast(@"type"));
+            coff.targetStore(&entry.type, @"type".u16);
 
             break :sri sri;
         },
@@ -4931,7 +4932,7 @@ fn loadObject(
                 reloc.virtual_address - section.header.virtual_address,
                 symbol.si,
                 .pending,
-                @bitCast(reloc.type),
+                .{ .u16 = reloc.type },
             );
         }
     }
-- 
2.54.0