authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-09-04 15:55:38+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-09-04 15:55:38+02:00
loge1d5bb365b3b8d645fbdfc4ffb6a14ef3bb0e766
tree87e84657c242c95177218185fe34bb5c6f69f035
parent516955dbdb6cb1a54a00e94dff516d5bfbe6dfc4

elf: fix 32bit build

2 files changed, 7 insertions(+), 5 deletions(-)

src/link/Elf/AtomList.zig+6-4
...@@ -85,8 +85,9 @@ pub fn write(list: AtomList, buffer: *std.ArrayList(u8), undefs: anytype, elf_fi...@@ -85,8 +85,9 @@ pub fn write(list: AtomList, buffer: *std.ArrayList(u8), undefs: anytype, elf_fi
8585
86 log.debug("writing atoms in section '{s}'", .{elf_file.getShString(osec.sh_name)});86 log.debug("writing atoms in section '{s}'", .{elf_file.getShString(osec.sh_name)});
8787
88 try buffer.ensureUnusedCapacity(list.size);88 const list_size = math.cast(usize, list.size) orelse return error.Overflow;
89 buffer.appendNTimesAssumeCapacity(0, list.size);89 try buffer.ensureUnusedCapacity(list_size);
90 buffer.appendNTimesAssumeCapacity(0, list_size);
9091
91 for (list.atoms.items) |ref| {92 for (list.atoms.items) |ref| {
92 const atom_ptr = elf_file.atom(ref).?;93 const atom_ptr = elf_file.atom(ref).?;
...@@ -120,8 +121,9 @@ pub fn writeRelocatable(list: AtomList, buffer: *std.ArrayList(u8), elf_file: *E...@@ -120,8 +121,9 @@ pub fn writeRelocatable(list: AtomList, buffer: *std.ArrayList(u8), elf_file: *E
120121
121 log.debug("writing atoms in section '{s}'", .{elf_file.getShString(osec.sh_name)});122 log.debug("writing atoms in section '{s}'", .{elf_file.getShString(osec.sh_name)});
122123
123 try buffer.ensureUnusedCapacity(list.size);124 const list_size = math.cast(usize, list.size) orelse return error.Overflow;
124 buffer.appendNTimesAssumeCapacity(0, list.size);125 try buffer.ensureUnusedCapacity(list_size);
126 buffer.appendNTimesAssumeCapacity(0, list_size);
125127
126 for (list.atoms.items) |ref| {128 for (list.atoms.items) |ref| {
127 const atom_ptr = elf_file.atom(ref).?;129 const atom_ptr = elf_file.atom(ref).?;
src/link/Elf/eh_frame.zig+1-1
...@@ -235,7 +235,7 @@ pub fn calcEhFrameSize(elf_file: *Elf) !usize {...@@ -235,7 +235,7 @@ pub fn calcEhFrameSize(elf_file: *Elf) !usize {
235235
236 var offset: usize = if (elf_file.zigObjectPtr()) |zo| blk: {236 var offset: usize = if (elf_file.zigObjectPtr()) |zo| blk: {
237 const sym = zo.symbol(zo.eh_frame_index orelse break :blk 0);237 const sym = zo.symbol(zo.eh_frame_index orelse break :blk 0);
238 break :blk sym.atom(elf_file).?.size;238 break :blk math.cast(usize, sym.atom(elf_file).?.size) orelse return error.Overflow;
239 } else 0;239 } else 0;
240240
241 var cies = std.ArrayList(Cie).init(gpa);241 var cies = std.ArrayList(Cie).init(gpa);