mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 13:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: fix building for 32-bit targets

Browse Source
This commit is contained in:
Andrew Kelley 2022-09-08 19:03:28 -07:00
parent 3ee01c14ee
commit 1b6fa1965a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/std/zig/system/NativeTargetInfo.zig
View File

@ -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| {

2
src/codegen/llvm.zig
View File

@ -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;
};