diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-09-08 19:03:28 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-09-08 20:52:49 -0700 |
| commit | 1b6fa1965a5472d9bc9e3140d052bde0fb949fe1 (patch) | |
| tree | 0fe765064acff44801cafb04213976e42fe5e273 | |
| parent | 3ee01c14ee7ba42b484f15daeacb67da90a81c9e (diff) | |
| download | zig-1b6fa1965a5472d9bc9e3140d052bde0fb949fe1.tar.gz zig-1b6fa1965a5472d9bc9e3140d052bde0fb949fe1.zip | |
stage2: fix building for 32-bit targets
| -rw-r--r-- | lib/std/zig/system/NativeTargetInfo.zig | 5 | ||||
| -rw-r--r-- | src/codegen/llvm.zig | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/std/zig/system/NativeTargetInfo.zig b/lib/std/zig/system/NativeTargetInfo.zig index 5ed4a02f74..0129df3020 100644 --- a/lib/std/zig/system/NativeTargetInfo.zig +++ b/lib/std/zig/system/NativeTargetInfo.zig @@ -485,8 +485,9 @@ fn glibcVerFromSoFile(file: fs.File) !std.builtin.Version { var buf: [40000]u8 = undefined; if (buf.len < dynstr.size) return error.InvalidGnuLibCVersion; - const dynstr_bytes = buf[0..dynstr.size]; - _ = try preadMin(file, dynstr_bytes, dynstr.offset, dynstr.size); + const dynstr_size = @intCast(usize, dynstr.size); + const dynstr_bytes = buf[0..dynstr_size]; + _ = try preadMin(file, dynstr_bytes, dynstr.offset, dynstr_size); var it = mem.split(u8, dynstr_bytes, &.{0}); var max_ver: std.builtin.Version = .{ .major = 2, .minor = 2, .patch = 5 }; while (it.next()) |s| { diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index 043f0bbdc7..3603713195 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -3870,7 +3870,7 @@ pub const DeclGen = struct { var b: usize = 0; for (parent_ty.structFields().values()[0..field_index]) |field| { if (field.is_comptime or !field.ty.hasRuntimeBitsIgnoreComptime()) continue; - b += field.ty.bitSize(target); + b += @intCast(usize, field.ty.bitSize(target)); } break :b b; }; |