Commit 8bffe87e9eeaf602d06eec60dffc955a86228fbd | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2023-03-21 21:31:24+01:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2023-03-21 21:31:24+01:00
log	8bffe87e9eeaf602d06eec60dffc955a86228fbd
tree	29c19709eaf820c53ea7b1481f430157bd2897e3
parent	1be86218153ae77109d785aafb29430f787adefd

macho: collect all exports into the export trie

2 files changed, 12 insertions(+), 31 deletions(-)

src
- link
  - MachO.zig
  - MachO
    zld.zig

src/link/MachO.zig+11-28

 @@ -3340,36 +3340,19 @@ fn collectExportData(self: *MachO, trie: *Trie) !void {
     const exec_segment = self.segments.items[self.header_segment_cmd_index.?];
     const base_address = exec_segment.vmaddr;
-    if (self.base.options.output_mode == .Exe) {
+    for (self.globals.items) |global| {
-        for (&[_]SymbolWithLoc{
+        const sym = self.getSymbol(global);
-            try self.getEntryPoint(),
-            self.getGlobal("__mh_execute_header").?,
-        }) |global| {
-            const sym = self.getSymbol(global);
-            const sym_name = self.getSymbolName(global);
-            log.debug("  (putting '{s}' defined at 0x{x})", .{ sym_name, sym.n_value });
-            try trie.put(gpa, .{
-                .name = sym_name,
-                .vmaddr_offset = sym.n_value - base_address,
-                .export_flags = macho.EXPORT_SYMBOL_FLAGS_KIND_REGULAR,
-            });
-        }
-    } else {
-        assert(self.base.options.output_mode == .Lib);
-        for (self.globals.items) |global| {
-            const sym = self.getSymbol(global);
-            if (sym.undf()) continue;
+        if (sym.undf()) continue;
-            if (!sym.ext()) continue;
+        if (!sym.ext()) continue;
-            const sym_name = self.getSymbolName(global);
+        const sym_name = self.getSymbolName(global);
-            log.debug("  (putting '{s}' defined at 0x{x})", .{ sym_name, sym.n_value });
+        log.debug("  (putting '{s}' defined at 0x{x})", .{ sym_name, sym.n_value });
-            try trie.put(gpa, .{
+        try trie.put(gpa, .{
-                .name = sym_name,
+            .name = sym_name,
-                .vmaddr_offset = sym.n_value - base_address,
+            .vmaddr_offset = sym.n_value - base_address,
-                .export_flags = macho.EXPORT_SYMBOL_FLAGS_KIND_REGULAR,
+            .export_flags = macho.EXPORT_SYMBOL_FLAGS_KIND_REGULAR,
-            });
+        });
-        }
     }
     try trie.finalize(gpa);

src/link/MachO/zld.zig+1-3

 @@ -2158,9 +2158,7 @@ pub const Zld = struct {
         try trie.finalize(gpa);
     }
-    fn writeDyldInfoData(
+    fn writeDyldInfoData(self: *Zld) !void {
-        self: *Zld,
-    ) !void {
         const gpa = self.gpa;
         var rebase = Rebase{};