zld: move should_rebase logic into Symbol

1 files changed, 19 insertions, 2 deletions

diff --git a/src/link/MachO/Symbol.zig b/src/link/MachO/Symbol.zig
index 16cd0c9ecc..5f437dc209 100644
--- a/src/link/MachO/Symbol.zig
+++ b/src/link/MachO/Symbol.zig
@@ -2,6 +2,7 @@ const Symbol = @This();
 
 const std = @import("std");
 const assert = std.debug.assert;
+const commands = @import("commands.zig");
 const macho = std.macho;
 const mem = std.mem;
 
@@ -57,6 +58,8 @@ pub const Regular = struct {
 
     local_sym_index: u32 = 0,
 
+    should_rebase: bool = false,
+
     pub const Linkage = enum {
         translation_unit,
         linkage_unit,
@@ -74,6 +77,9 @@ pub const Regular = struct {
         if (self.weak_ref) {
             try std.fmt.format(writer, ".weak_ref, ", .{});
         }
+        if (self.should_rebase) {
+            try std.fmt.format(writer, ".should_rebase, ", .{});
+        }
         if (self.file) |file| {
             try std.fmt.format(writer, ".file = {s}, ", .{file.name.?});
         }
@@ -108,8 +114,8 @@ pub const Proxy = struct {
     /// Dynamic binding info - spots within the final
     /// executable where this proxy is referenced from.
     bind_info: std.ArrayListUnmanaged(struct {
-        segment_id: u16,
-        address: u64,
+        local_sym_index: u32,
+        offset: u32,
     }) = .{},
 
     /// Dylib where to locate this symbol.
@@ -198,6 +204,17 @@ pub fn isTemp(symbol: Symbol) bool {
     return false;
 }
 
+pub fn needsTlvOffset(self: Symbol, zld: *Zld) bool {
+    if (self.payload != .regular) return false;
+
+    const reg = self.payload.regular;
+    const seg = zld.load_command.items[reg.segment_id].Segment;
+    const sect = seg.sections.items[reg.section_id];
+    const sect_type = commands.sectionType(sect);
+
+    return sect_type == macho.S_THREAD_LOCAL_VARIABLES;
+}
+
 pub fn asNlist(symbol: *Symbol, strtab: *StringTable) !macho.nlist_64 {
     const n_strx = try strtab.getOrPut(symbol.name);
     const nlist = nlist: {