mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-06 13:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

macho: fix 32bit builds

Browse Source
This commit is contained in:
Jakub Konka 2024-01-28 19:14:55 +01:00
parent 17215bd2c8
commit 5b315f8a3a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/link/MachO/InternalObject.zig
View File

@ -169,13 +169,16 @@ pub fn getAtomData(self: *const InternalObject, atom: Atom, buffer: []u8) !void
const slice = self.sections.slice();
const sect = slice.items(.header)[atom.n_sect];
const extra = slice.items(.extra)[atom.n_sect];
const data = if (extra.is_objc_methname)
self.objc_methnames.items[sect.offset..][0..sect.size]
else if (extra.is_objc_selref)
const data = if (extra.is_objc_methname) blk: {
const size = std.math.cast(usize, sect.size) orelse return error.Overflow;
break :blk self.objc_methnames.items[sect.offset..][0..size];
} else if (extra.is_objc_selref)
&self.objc_selrefs
else
@panic("ref to non-existent section");
@memcpy(buffer, data[atom.off..][0..atom.size]);
const off = std.math.cast(usize, atom.off) orelse return error.Overflow;
const size = std.math.cast(usize, atom.size) orelse return error.Overflow;
@memcpy(buffer, data[off..][0..size]);
}
pub fn getAtomRelocs(self: *const InternalObject, atom: Atom) []const Relocation {

3
src/link/MachO/Object.zig
View File

@ -1589,7 +1589,8 @@ fn getSectionData(self: *const Object, allocator: Allocator, index: u32) ![]u8 {
assert(index < slice.items(.header).len);
const sect = slice.items(.header)[index];
const offset = if (self.archive) |ar| ar.offset else 0;
const buffer = try allocator.alloc(u8, sect.size);
const size = math.cast(usize, sect.size) orelse return error.Overflow;
const buffer = try allocator.alloc(u8, size);
errdefer allocator.free(buffer);
const amt = try self.file.preadAll(buffer, sect.offset + offset);
if (amt != buffer.len) return error.InputOutput;