From b2febd1ce703ec7af8fdf21ec966c0f1b94a98f2 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Thu, 19 Jan 2023 09:53:18 +0100 Subject: [PATCH] macho: fix 32bit build --- src/link/MachO/dyld_info/Rebase.zig | 2 +- src/link/MachO/dyld_info/bind.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/link/MachO/dyld_info/Rebase.zig b/src/link/MachO/dyld_info/Rebase.zig index 5004262b4d45f0fc2f24d0bd33d7edb98e027a0b..0233744c4348d7a88840e094b949d99314ab0445 100644 --- a/src/link/MachO/dyld_info/Rebase.zig +++ b/src/link/MachO/dyld_info/Rebase.zig @@ -179,7 +179,7 @@ fn rebaseTimesSkip(count: usize, skip: u64, writer: anytype) !void { fn addAddr(addr: u64, writer: anytype) !void { log.debug(">>> add: {x}", .{addr}); - if (std.mem.isAligned(addr, @sizeOf(u64))) { + if (std.mem.isAlignedGeneric(u64, addr, @sizeOf(u64))) { const imm = @divExact(addr, @sizeOf(u64)); if (imm <= 0xf) { try writer.writeByte(macho.REBASE_OPCODE_ADD_ADDR_IMM_SCALED | @truncate(u4, imm)); diff --git a/src/link/MachO/dyld_info/bind.zig b/src/link/MachO/dyld_info/bind.zig index 7f7dc498b802223d93f5d2be2e3e7834b39f2a13..b4e51478e0ad0033dc3987140e8948d11a73a26c 100644 --- a/src/link/MachO/dyld_info/bind.zig +++ b/src/link/MachO/dyld_info/bind.zig @@ -291,7 +291,7 @@ fn doBind(writer: anytype) !void { fn doBindAddAddr(addr: u64, writer: anytype) !void { log.debug(">>> bind with add: {x}", .{addr}); - if (std.mem.isAligned(addr, @sizeOf(u64))) { + if (std.mem.isAlignedGeneric(u64, addr, @sizeOf(u64))) { const imm = @divExact(addr, @sizeOf(u64)); if (imm <= 0xf) { try writer.writeByte( -- 2.54.0