authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-06-25 10:52:05-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-06-25 10:52:40-07:00
logc4c92b0476c5847c92a1b6c6d709207036c60e34
tree4263bcc3b11214ce9fc66b851baf0e4c5f053479
parent2808d9a8788bb1b1495b0424d71393ad7674dde9

link.Coff: update to latest `@bitCast` semantics

fixes invisible merge conflict

1 files changed, 3 insertions(+), 2 deletions(-)

src/link/Coff.zig+3-2
......@@ -1180,6 +1180,7 @@ pub const Reloc = extern struct {
11801180 IA64: std.coff.IMAGE.REL.IA64,
11811181 MIPS: std.coff.IMAGE.REL.MIPS,
11821182 M32R: std.coff.IMAGE.REL.M32R,
1183 u16: u16,
11831184 };
11841185
11851186 pub const Index = enum(u32) {
......@@ -3787,7 +3788,7 @@ fn addRelocAssumeCapacity(
37873788
37883789 // applyLocationRelocs updates `virtual_address`
37893790 // flushSymbolTableIndex updates `symbol_table_index`
3790 coff.targetStore(&entry.type, @bitCast(@"type"));
3791 coff.targetStore(&entry.type, @"type".u16);
37913792
37923793 break :sri sri;
37933794 },
......@@ -4931,7 +4932,7 @@ fn loadObject(
49314932 reloc.virtual_address - section.header.virtual_address,
49324933 symbol.si,
49334934 .pending,
4934 @bitCast(reloc.type),
4935 .{ .u16 = reloc.type },
49354936 );
49364937 }
49374938 }