diff --git a/src/link/MachO/Object.zig b/src/link/MachO/Object.zig index dc62bc65002e889f52406c45f154ca1179388418..d283b35a883808b5c33db2efc5f5e2861541c1d3 100644 --- a/src/link/MachO/Object.zig +++ b/src/link/MachO/Object.zig @@ -1536,7 +1536,7 @@ pub fn mergeSymbolVisibility(self: *Object, macho_file: *MachO) void { for (self.symbols.items, 0..) |sym, i| { const ref = self.getSymbolRef(@intCast(i), macho_file); const global = ref.getSymbol(macho_file) orelse continue; - if (global.visibility != .global) { + if (sym.visibility.rank() < global.visibility.rank()) { global.visibility = sym.visibility; } if (sym.flags.weak_ref) { diff --git a/src/link/MachO/Symbol.zig b/src/link/MachO/Symbol.zig index 8cb198e7d75561c60dd7d685e4c2f94b0428acdb..72cd55bf5a3c9ec9aaf1f28c78537a2a6cf4b704 100644 --- a/src/link/MachO/Symbol.zig +++ b/src/link/MachO/Symbol.zig @@ -331,9 +331,14 @@ fn format2( if (symbol.getAtom(ctx.macho_file)) |atom| { try writer.print(" : atom({d})", .{atom.atom_index}); } - var buf: [2]u8 = .{'_'} ** 2; + var buf: [3]u8 = .{'_'} ** 3; if (symbol.flags.@"export") buf[0] = 'E'; if (symbol.flags.import) buf[1] = 'I'; + switch (symbol.visibility) { + .local => buf[2] = 'L', + .hidden => buf[2] = 'H', + .global => buf[2] = 'G', + } try writer.print(" : {s}", .{&buf}); if (symbol.flags.weak) try writer.writeAll(" : weak"); if (symbol.isSymbolStab(ctx.macho_file)) try writer.writeAll(" : stab"); @@ -402,6 +407,14 @@ pub const Visibility = enum { global, hidden, local, + + pub fn rank(vis: Visibility) u2 { + return switch (vis) { + .local => 2, + .hidden => 1, + .global => 0, + }; + } }; pub const Extra = struct { diff --git a/src/link/MachO/ZigObject.zig b/src/link/MachO/ZigObject.zig index 544d778f3952960f1e235f39fa7efd35f3a20a93..661a88904e78188a8a9920ede8187a0c1492c5d5 100644 --- a/src/link/MachO/ZigObject.zig +++ b/src/link/MachO/ZigObject.zig @@ -267,7 +267,7 @@ pub fn mergeSymbolVisibility(self: *ZigObject, macho_file: *MachO) void { for (self.symbols.items, 0..) |sym, i| { const ref = self.getSymbolRef(@intCast(i), macho_file); const global = ref.getSymbol(macho_file) orelse continue; - if (global.visibility != .global) { + if (sym.visibility.rank() < global.visibility.rank()) { global.visibility = sym.visibility; } if (sym.flags.weak_ref) {