authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-09-08 19:03:28-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-09-08 20:52:49-07:00
log1b6fa1965a5472d9bc9e3140d052bde0fb949fe1
tree0fe765064acff44801cafb04213976e42fe5e273
parent3ee01c14ee7ba42b484f15daeacb67da90a81c9e

stage2: fix building for 32-bit targets

2 files changed, 4 insertions(+), 3 deletions(-)

lib/std/zig/system/NativeTargetInfo.zig+3-2
...@@ -485,8 +485,9 @@ fn glibcVerFromSoFile(file: fs.File) !std.builtin.Version {...@@ -485,8 +485,9 @@ fn glibcVerFromSoFile(file: fs.File) !std.builtin.Version {
485 var buf: [40000]u8 = undefined;485 var buf: [40000]u8 = undefined;
486 if (buf.len < dynstr.size) return error.InvalidGnuLibCVersion;486 if (buf.len < dynstr.size) return error.InvalidGnuLibCVersion;
487487
488 const dynstr_bytes = buf[0..dynstr.size];488 const dynstr_size = @intCast(usize, dynstr.size);
489 _ = try preadMin(file, dynstr_bytes, dynstr.offset, dynstr.size);489 const dynstr_bytes = buf[0..dynstr_size];
490 _ = try preadMin(file, dynstr_bytes, dynstr.offset, dynstr_size);
490 var it = mem.split(u8, dynstr_bytes, &.{0});491 var it = mem.split(u8, dynstr_bytes, &.{0});
491 var max_ver: std.builtin.Version = .{ .major = 2, .minor = 2, .patch = 5 };492 var max_ver: std.builtin.Version = .{ .major = 2, .minor = 2, .patch = 5 };
492 while (it.next()) |s| {493 while (it.next()) |s| {
src/codegen/llvm.zig+1-1
...@@ -3870,7 +3870,7 @@ pub const DeclGen = struct {...@@ -3870,7 +3870,7 @@ pub const DeclGen = struct {
3870 var b: usize = 0;3870 var b: usize = 0;
3871 for (parent_ty.structFields().values()[0..field_index]) |field| {3871 for (parent_ty.structFields().values()[0..field_index]) |field| {
3872 if (field.is_comptime or !field.ty.hasRuntimeBitsIgnoreComptime()) continue;3872 if (field.is_comptime or !field.ty.hasRuntimeBitsIgnoreComptime()) continue;
3873 b += field.ty.bitSize(target);3873 b += @intCast(usize, field.ty.bitSize(target));
3874 }3874 }
3875 break :b b;3875 break :b b;
3876 };3876 };