elf: fix formatting of relocs when reloc can be Zig specific

2 files changed, 34 insertions, 28 deletions

diff --git a/src/link/Elf/Atom.zig b/src/link/Elf/Atom.zig
index a86d0722ff..558bd06d98 100644
--- a/src/link/Elf/Atom.zig
+++ b/src/link/Elf/Atom.zig
@@ -336,7 +336,7 @@ pub fn writeRelocs(self: Atom, elf_file: *Elf, out_relocs: *std.ArrayList(elf.El
         }
 
         relocs_log.debug("  {s}: [{x} => {d}({s})] + {x}", .{
-            relocation.fmtRelocType(r_type, cpu_arch),
+            relocation.fmtRelocType(rel.r_type(), cpu_arch),
             r_offset,
             r_sym,
             target.name(elf_file),
@@ -1028,7 +1028,7 @@ const x86_64 = struct {
             const DTP = @as(i64, @intCast(elf_file.dtpAddress()));
 
             relocs_log.debug("  {s}: {x}: [{x} => {x}] G({x}) ZG({x}) ({s})", .{
-                @tagName(r_type),
+                relocation.fmtRelocType(rel.r_type(), .x86_64),
                 r_offset,
                 P,
                 S + A,
@@ -1218,8 +1218,8 @@ const x86_64 = struct {
             // Address of the dynamic thread pointer.
             const DTP = @as(i64, @intCast(elf_file.dtpAddress()));
 
-            relocs_log.debug("  {s}: {x}: [{x} => {x}] ({s})", .{
-                @tagName(r_type),
+            relocs_log.debug("  {}: {x}: [{x} => {x}] ({s})", .{
+                relocation.fmtRelocType(rel.r_type(), .x86_64),
                 rel.r_offset,
                 P,
                 S + A,
@@ -1291,9 +1291,8 @@ const x86_64 = struct {
     ) !void {
         assert(rels.len == 2);
         const writer = stream.writer();
-        const rel_0: elf.R_X86_64 = @enumFromInt(rels[0].r_type());
-        const rel_1: elf.R_X86_64 = @enumFromInt(rels[1].r_type());
-        switch (rel_1) {
+        const rel: elf.R_X86_64 = @enumFromInt(rels[1].r_type());
+        switch (rel) {
             .R_X86_64_PC32,
             .R_X86_64_PLT32,
             => {
@@ -1308,9 +1307,9 @@ const x86_64 = struct {
 
             else => {
                 var err = try elf_file.addErrorWithNotes(1);
-                try err.addMsg(elf_file, "fatal linker error: rewrite {s} when followed by {s}", .{
-                    @tagName(rel_0),
-                    @tagName(rel_1),
+                try err.addMsg(elf_file, "fatal linker error: rewrite {} when followed by {}", .{
+                    relocation.fmtRelocType(rels[0].r_type(), .x86_64),
+                    relocation.fmtRelocType(rels[1].r_type(), .x86_64),
                 });
                 try err.addNote(elf_file, "in {}:{s} at offset 0x{x}", .{
                     self.file(elf_file).?.fmtPath(),
@@ -1330,9 +1329,8 @@ const x86_64 = struct {
     ) !void {
         assert(rels.len == 2);
         const writer = stream.writer();
-        const rel_0: elf.R_X86_64 = @enumFromInt(rels[0].r_type());
-        const rel_1: elf.R_X86_64 = @enumFromInt(rels[1].r_type());
-        switch (rel_1) {
+        const rel: elf.R_X86_64 = @enumFromInt(rels[1].r_type());
+        switch (rel) {
             .R_X86_64_PC32,
             .R_X86_64_PLT32,
             => {
@@ -1362,9 +1360,9 @@ const x86_64 = struct {
 
             else => {
                 var err = try elf_file.addErrorWithNotes(1);
-                try err.addMsg(elf_file, "fatal linker error: rewrite {s} when followed by {s}", .{
-                    @tagName(rel_0),
-                    @tagName(rel_1),
+                try err.addMsg(elf_file, "fatal linker error: rewrite {} when followed by {}", .{
+                    relocation.fmtRelocType(rels[0].r_type(), .x86_64),
+                    relocation.fmtRelocType(rels[1].r_type(), .x86_64),
                 });
                 try err.addNote(elf_file, "in {}:{s} at offset 0x{x}", .{
                     self.file(elf_file).?.fmtPath(),
@@ -1431,9 +1429,8 @@ const x86_64 = struct {
     ) !void {
         assert(rels.len == 2);
         const writer = stream.writer();
-        const rel_0: elf.R_X86_64 = @enumFromInt(rels[0].r_type());
-        const rel_1: elf.R_X86_64 = @enumFromInt(rels[1].r_type());
-        switch (rel_1) {
+        const rel: elf.R_X86_64 = @enumFromInt(rels[1].r_type());
+        switch (rel) {
             .R_X86_64_PC32,
             .R_X86_64_PLT32,
             .R_X86_64_GOTPCREL,
@@ -1446,14 +1443,17 @@ const x86_64 = struct {
                 std.mem.writeInt(i32, insts[12..][0..4], value, .little);
                 try stream.seekBy(-4);
                 try writer.writeAll(&insts);
-                relocs_log.debug("    relaxing {s} and {s}", .{ @tagName(rel_0), @tagName(rel_1) });
+                relocs_log.debug("    relaxing {} and {}", .{
+                    relocation.fmtRelocType(rels[0].r_type(), .x86_64),
+                    relocation.fmtRelocType(rels[1].r_type(), .x86_64),
+                });
             },
 
             else => {
                 var err = try elf_file.addErrorWithNotes(1);
-                try err.addMsg(elf_file, "fatal linker error: rewrite {s} when followed by {s}", .{
-                    @tagName(rel_0),
-                    @tagName(rel_1),
+                try err.addMsg(elf_file, "fatal linker error: rewrite {} when followed by {}", .{
+                    relocation.fmtRelocType(rels[0].r_type(), .x86_64),
+                    relocation.fmtRelocType(rels[1].r_type(), .x86_64),
                 });
                 try err.addNote(elf_file, "in {}:{s} at offset 0x{x}", .{
                     self.file(elf_file).?.fmtPath(),
diff --git a/src/link/Elf/relocation.zig b/src/link/Elf/relocation.zig
index b6803f9166..60ae54a6e9 100644
--- a/src/link/Elf/relocation.zig
+++ b/src/link/Elf/relocation.zig
@@ -106,11 +106,15 @@ fn formatRelocType(
     _ = unused_fmt_string;
     _ = options;
     const r_type = ctx.r_type;
-    const str = switch (ctx.cpu_arch) {
-        .x86_64 => @tagName(@as(elf.R_X86_64, @enumFromInt(r_type))),
-        .aarch64 => @tagName(@as(elf.R_AARCH64, @enumFromInt(r_type))),
-        .riscv64 => @tagName(@as(elf.R_RISCV, @enumFromInt(r_type))),
-        else => unreachable,
+    const str = switch (r_type) {
+        Elf.R_ZIG_GOT32 => "R_ZIG_GOT32",
+        Elf.R_ZIG_GOTPCREL => "R_ZIG_GOTPCREL",
+        else => switch (ctx.cpu_arch) {
+            .x86_64 => @tagName(@as(elf.R_X86_64, @enumFromInt(r_type))),
+            .aarch64 => @tagName(@as(elf.R_AARCH64, @enumFromInt(r_type))),
+            .riscv64 => @tagName(@as(elf.R_RISCV, @enumFromInt(r_type))),
+            else => unreachable,
+        },
     };
     try writer.print("{s}", .{str});
 }
@@ -118,3 +122,5 @@ fn formatRelocType(
 const assert = std.debug.assert;
 const elf = std.elf;
 const std = @import("std");
+
+const Elf = @import("../Elf.zig");