authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-09-01 23:26:24+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-09-01 23:26:24+02:00
log17066cc12e6fc3fb5349032dbcfbfd3552000a8d
tree5a324aa7b5f8b667cd832ef5605715f766dccbb0
parent4eff0f4ea17da9ca8819d34fbf855596c3398497

macho: minor refactor of const namings

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

src/link/MachO.zig+3-5
...@@ -271,9 +271,7 @@ pub const GotIndirectionKey = struct {...@@ -271,9 +271,7 @@ pub const GotIndirectionKey = struct {
271const ideal_factor = 2;271const ideal_factor = 2;
272272
273/// Default path to dyld273/// Default path to dyld
274/// TODO instead of hardcoding it, we should probably look through some env vars and search paths274const default_dyld_path: [*:0]const u8 = "/usr/lib/dyld";
275/// instead but this will do for now.
276const DEFAULT_DYLD_PATH: [*:0]const u8 = "/usr/lib/dyld";
277275
278/// In order for a slice of bytes to be considered eligible to keep metadata pointing at276/// In order for a slice of bytes to be considered eligible to keep metadata pointing at
279/// it as a possible place to put new symbols, it must have enough room for this many bytes277/// it as a possible place to put new symbols, it must have enough room for this many bytes
...@@ -4315,7 +4313,7 @@ pub fn populateMissingMetadata(self: *MachO) !void {...@@ -4315,7 +4313,7 @@ pub fn populateMissingMetadata(self: *MachO) !void {
4315 self.dylinker_cmd_index = @intCast(u16, self.load_commands.items.len);4313 self.dylinker_cmd_index = @intCast(u16, self.load_commands.items.len);
4316 const cmdsize = @intCast(u32, mem.alignForwardGeneric(4314 const cmdsize = @intCast(u32, mem.alignForwardGeneric(
4317 u64,4315 u64,
4318 @sizeOf(macho.dylinker_command) + mem.lenZ(DEFAULT_DYLD_PATH),4316 @sizeOf(macho.dylinker_command) + mem.lenZ(default_dyld_path),
4319 @sizeOf(u64),4317 @sizeOf(u64),
4320 ));4318 ));
4321 var dylinker_cmd = commands.emptyGenericCommandWithData(macho.dylinker_command{4319 var dylinker_cmd = commands.emptyGenericCommandWithData(macho.dylinker_command{
...@@ -4325,7 +4323,7 @@ pub fn populateMissingMetadata(self: *MachO) !void {...@@ -4325,7 +4323,7 @@ pub fn populateMissingMetadata(self: *MachO) !void {
4325 });4323 });
4326 dylinker_cmd.data = try self.base.allocator.alloc(u8, cmdsize - dylinker_cmd.inner.name);4324 dylinker_cmd.data = try self.base.allocator.alloc(u8, cmdsize - dylinker_cmd.inner.name);
4327 mem.set(u8, dylinker_cmd.data, 0);4325 mem.set(u8, dylinker_cmd.data, 0);
4328 mem.copy(u8, dylinker_cmd.data, mem.spanZ(DEFAULT_DYLD_PATH));4326 mem.copy(u8, dylinker_cmd.data, mem.spanZ(default_dyld_path));
4329 try self.load_commands.append(self.base.allocator, .{ .Dylinker = dylinker_cmd });4327 try self.load_commands.append(self.base.allocator, .{ .Dylinker = dylinker_cmd });
4330 self.load_commands_dirty = true;4328 self.load_commands_dirty = true;
4331 }4329 }