aboutsummaryrefslogtreecommitdiff
path: root/src/link
diff options
context:
space:
mode:
authorTimon Kruiper <timonkruiper@gmail.com>2020-10-06 12:08:12 +0200
committerAndrew Kelley <andrew@ziglang.org>2020-10-06 23:39:58 -0700
commitbd7eab573a5e5f1366cd5dc3639fef28c4acb32a (patch)
treef1f6a4363781197db451e072ea7650595032bc6c /src/link
parentfb63a2cfaecb981010e0b9d656fd372dbb331888 (diff)
downloadzig-bd7eab573a5e5f1366cd5dc3639fef28c4acb32a.tar.gz
zig-bd7eab573a5e5f1366cd5dc3639fef28c4acb32a.zip
Fix building the zig compiler for 32-bit targets
Diffstat (limited to 'src/link')
-rw-r--r--src/link/Elf.zig4
-rw-r--r--src/link/MachO.zig2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/link/Elf.zig b/src/link/Elf.zig
index 4be47ccdf7..3a847a623d 100644
--- a/src/link/Elf.zig
+++ b/src/link/Elf.zig
@@ -2757,7 +2757,7 @@ fn writeSymbol(self: *Elf, index: usize) !void {
if (needed_size > self.allocatedSize(syms_sect.sh_offset)) {
// Move all the symbols to a new file location.
const new_offset = self.findFreeSpace(needed_size, sym_align);
- const existing_size = @as(u64, syms_sect.sh_info) * sym_size;
+ const existing_size = syms_sect.sh_info * sym_size;
const amt = try self.base.file.?.copyRangeAll(syms_sect.sh_offset, self.base.file.?, new_offset, existing_size);
if (amt != existing_size) return error.InputOutput;
syms_sect.sh_offset = new_offset;
@@ -2911,7 +2911,7 @@ fn pwriteDbgLineNops(
prev_padding_size: usize,
buf: []const u8,
next_padding_size: usize,
- offset: usize,
+ offset: u64,
) !void {
const tracy = trace(@src());
defer tracy.end();
diff --git a/src/link/MachO.zig b/src/link/MachO.zig
index 1675c56b03..732ed1e8d9 100644
--- a/src/link/MachO.zig
+++ b/src/link/MachO.zig
@@ -1267,7 +1267,7 @@ fn updateString(self: *MachO, old_str_off: u32, new_name: []const u8) !u32 {
fn addPadding(self: *MachO, size: u64, file_offset: u64) !void {
if (size == 0) return;
- const buf = try self.base.allocator.alloc(u8, size);
+ const buf = try self.base.allocator.alloc(u8, @intCast(usize, size));
defer self.base.allocator.free(buf);
mem.set(u8, buf[0..], 0);