From 23135302904467aa2e814500af6327408c46f52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Thu, 28 Nov 2024 22:52:13 +0200 Subject: [PATCH] Backport consolidate.zig to zig 0.11.0 --- consolidate.zig | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/consolidate.zig b/consolidate.zig index 0956b11ea983..b5f4969d28c2 100644 --- a/consolidate.zig +++ b/consolidate.zig @@ -126,10 +126,6 @@ const versions = [_]Version{ .{.major = 2, .minor = 32}, .{.major = 2, .minor = 33}, .{.major = 2, .minor = 34}, - .{.major = 2, .minor = 35}, - .{.major = 2, .minor = 36}, - .{.major = 2, .minor = 37}, - .{.major = 2, .minor = 38}, }; // fpu/nofpu are hardcoded elsewhere, based on .gnueabi/.gnueabihf with an exception for .arm @@ -838,7 +834,7 @@ pub fn main() !void { { // Function Inclusions - try w.writeIntLittle(u16, @intCast(fn_inclusions.items.len)); + try w.writeIntLittle(u16, @as(u16, @intCast(fn_inclusions.items.len))); var i: usize = 0; while (i < fn_inclusions.items.len) { const name = fn_inclusions.items[i].name; @@ -874,7 +870,7 @@ pub fn main() !void { { // Object Inclusions - try w.writeIntLittle(u16, @intCast(obj_inclusions.items.len)); + try w.writeIntLittle(u16, @as(u16, @intCast(obj_inclusions.items.len))); var i: usize = 0; while (i < obj_inclusions.items.len) { const name = obj_inclusions.items[i].name; -- 2.47.0