mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

macho: fix 32bit compilation issues

Browse Source
This commit is contained in:
Jakub Konka 2023-08-28 07:31:44 +02:00
parent 8330065a99
commit 0f02a1fcb0
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/link/MachO.zig
View File

@ -927,9 +927,7 @@ fn parseDylib(
const self_cpu_arch = link_options.target.cpu.arch;
const file_stat = try file.stat();
var file_size = math.cast(usize, file_stat.size) orelse return error.Overflow;
file_size -= offset;
const file_size = math.cast(usize, file_stat.size - offset) orelse return error.Overflow;
const contents = try file.readToEndAllocOptions(gpa, file_size, file_size, @alignOf(u64), null);
defer gpa.free(contents);

18
src/link/MachO/zld.zig
View File

@ -703,7 +703,8 @@ fn writeAtoms(macho_file: *MachO) !void {
log.debug(" (with padding {x})", .{padding_size});
}
const offset = this_sym.n_value - header.addr;
const offset = math.cast(usize, this_sym.n_value - header.addr) orelse
return error.Overflow;
log.debug(" (at offset 0x{x})", .{offset});
const code = Atom.getAtomCode(macho_file, atom_index);
@ -749,7 +750,8 @@ fn writeThunks(macho_file: *MachO) !void {
for (macho_file.thunks.items, 0..) |*thunk, i| {
if (thunk.getSize() == 0) continue;
var buffer = try std.ArrayList(u8).initCapacity(gpa, thunk.getSize());
const thunk_size = math.cast(usize, thunk.getSize()) orelse return error.Overflow;
var buffer = try std.ArrayList(u8).initCapacity(gpa, thunk_size);
defer buffer.deinit();
try thunks.writeThunkCode(macho_file, thunk, buffer.writer());
const thunk_atom = macho_file.getAtom(thunk.getStartAtomIndex());
@ -763,7 +765,8 @@ fn writeThunks(macho_file: *MachO) !void {
fn writePointerEntries(macho_file: *MachO, sect_id: u8, table: anytype) !void {
const gpa = macho_file.base.allocator;
const header = macho_file.sections.items(.header)[sect_id];
var buffer = try std.ArrayList(u8).initCapacity(gpa, header.size);
const capacity = math.cast(usize, header.size) orelse return error.Overflow;
var buffer = try std.ArrayList(u8).initCapacity(gpa, capacity);
defer buffer.deinit();
for (table.entries.items) |entry| {
const sym = macho_file.getSymbol(entry);
@ -779,7 +782,8 @@ fn writeStubs(macho_file: *MachO) !void {
const stubs_header = macho_file.sections.items(.header)[macho_file.stubs_section_index.?];
const la_symbol_ptr_header = macho_file.sections.items(.header)[macho_file.la_symbol_ptr_section_index.?];
var buffer = try std.ArrayList(u8).initCapacity(gpa, stubs_header.size);
const capacity = math.cast(usize, stubs_header.size) orelse return error.Overflow;
var buffer = try std.ArrayList(u8).initCapacity(gpa, capacity);
defer buffer.deinit();
for (0..macho_file.stub_table.count()) |index| {
@ -799,7 +803,8 @@ fn writeStubHelpers(macho_file: *MachO) !void {
const cpu_arch = macho_file.base.options.target.cpu.arch;
const stub_helper_header = macho_file.sections.items(.header)[macho_file.stub_helper_section_index.?];
var buffer = try std.ArrayList(u8).initCapacity(gpa, stub_helper_header.size);
const capacity = math.cast(usize, stub_helper_header.size) orelse return error.Overflow;
var buffer = try std.ArrayList(u8).initCapacity(gpa, capacity);
defer buffer.deinit();
{
@ -842,7 +847,8 @@ fn writeLaSymbolPtrs(macho_file: *MachO) !void {
const la_symbol_ptr_header = macho_file.sections.items(.header)[macho_file.la_symbol_ptr_section_index.?];
const stub_helper_header = macho_file.sections.items(.header)[macho_file.stub_helper_section_index.?];
var buffer = try std.ArrayList(u8).initCapacity(gpa, la_symbol_ptr_header.size);
const capacity = math.cast(usize, la_symbol_ptr_header.size) orelse return error.Overflow;
var buffer = try std.ArrayList(u8).initCapacity(gpa, capacity);
defer buffer.deinit();
for (0..macho_file.stub_table.count()) |index| {