diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 333e490d1751..088485a78d9b 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -1100,7 +1100,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod error.MalformedObject, error.MalformedArchive, error.MismatchedEflags, - error.InvalidCpuArch, + error.InvalidMachineType, => continue, // already reported else => |e| try self.reportParseError( obj.path, @@ -1187,7 +1187,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod for (system_libs.items) |lib| { self.parseLibrary(lib, false) catch |err| switch (err) { - error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported + error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported else => |e| try self.reportParseError( lib.path, "unexpected error: parsing library failed with error {s}", @@ -1213,7 +1213,7 @@ pub fn flushModule(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_nod error.MalformedObject, error.MalformedArchive, error.MismatchedEflags, - error.InvalidCpuArch, + error.InvalidMachineType, => continue, // already reported else => |e| try self.reportParseError( obj.path, @@ -1642,7 +1642,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void { pub const ParseError = error{ MalformedObject, MalformedArchive, - InvalidCpuArch, + InvalidMachineType, MismatchedEflags, OutOfMemory, Overflow, @@ -1813,7 +1813,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void { .needed = scr_obj.needed, .path = full_path, }, false) catch |err| switch (err) { - error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported + error.MalformedObject, error.MalformedArchive, error.InvalidMachineType => continue, // already reported else => |e| try self.reportParseError( full_path, "unexpected error: parsing library failed with error {s}", diff --git a/src/link/Elf/Object.zig b/src/link/Elf/Object.zig index d329218b8d8b..584e5ad6d3e6 100644 --- a/src/link/Elf/Object.zig +++ b/src/link/Elf/Object.zig @@ -112,7 +112,7 @@ fn parseCommon(self: *Object, allocator: Allocator, handle: std.fs.File, elf_fil "invalid ELF machine type: {s}", .{@tagName(self.header.?.e_machine)}, ); - return error.InvalidCpuArch; + return error.InvalidMachineType; } try elf_file.validateEFlags(self.index, self.header.?.e_flags); diff --git a/src/link/Elf/SharedObject.zig b/src/link/Elf/SharedObject.zig index 7fdf9116b5f1..9463cad75a73 100644 --- a/src/link/Elf/SharedObject.zig +++ b/src/link/Elf/SharedObject.zig @@ -63,7 +63,7 @@ pub fn parse(self: *SharedObject, elf_file: *Elf, handle: std.fs.File) !void { "invalid ELF machine type: {s}", .{@tagName(self.header.?.e_machine)}, ); - return error.InvalidCpuArch; + return error.InvalidMachineType; } const shoff = std.math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow; diff --git a/src/link/Elf/relocatable.zig b/src/link/Elf/relocatable.zig index 50b9b562d12c..06850f87ac7b 100644 --- a/src/link/Elf/relocatable.zig +++ b/src/link/Elf/relocatable.zig @@ -21,7 +21,7 @@ pub fn flushStaticLib(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]co parsePositional(elf_file, obj.path) catch |err| switch (err) { error.MalformedObject, error.MalformedArchive, - error.InvalidCpuArch, + error.InvalidMachineType, error.MismatchedEflags, => continue, // already reported error.UnknownFileType => try elf_file.reportParseError(obj.path, "unknown file type for an object file", .{}), @@ -178,7 +178,7 @@ pub fn flushObject(elf_file: *Elf, comp: *Compilation, module_obj_path: ?[]const elf_file.parsePositional(obj.path, obj.must_link) catch |err| switch (err) { error.MalformedObject, error.MalformedArchive, - error.InvalidCpuArch, + error.InvalidMachineType, error.MismatchedEflags, => continue, // already reported else => |e| try elf_file.reportParseError( diff --git a/src/link/MachO.zig b/src/link/MachO.zig index d99fc2185e6e..cfcf6b79653a 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -921,7 +921,7 @@ fn parseInputFileWorker(self: *MachO, file: File) void { error.MalformedObject, error.MalformedDylib, error.MalformedTbd, - error.InvalidCpuArch, + error.InvalidMachineType, error.InvalidTarget, => {}, // already reported else => |e| self.reportParseError2(file.getIndex(), "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}) catch {}, diff --git a/src/link/MachO/Dylib.zig b/src/link/MachO/Dylib.zig index ce12397be45b..7c52f6937681 100644 --- a/src/link/MachO/Dylib.zig +++ b/src/link/MachO/Dylib.zig @@ -75,12 +75,12 @@ fn parseBinary(self: *Dylib, macho_file: *MachO) !void { macho.CPU_TYPE_X86_64 => .x86_64, else => |x| { try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x}); - return error.InvalidCpuArch; + return error.InvalidMachineType; }, }; if (macho_file.getTarget().cpu.arch != this_cpu_arch) { try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)}); - return error.InvalidCpuArch; + return error.InvalidMachineType; } const lc_buffer = try gpa.alloc(u8, header.sizeofcmds); diff --git a/src/link/MachO/Object.zig b/src/link/MachO/Object.zig index 38cb82e858ff..ad83777906a7 100644 --- a/src/link/MachO/Object.zig +++ b/src/link/MachO/Object.zig @@ -91,12 +91,12 @@ pub fn parse(self: *Object, macho_file: *MachO) !void { macho.CPU_TYPE_X86_64 => .x86_64, else => |x| { try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x}); - return error.InvalidCpuArch; + return error.InvalidMachineType; }, }; if (cpu_arch != this_cpu_arch) { try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)}); - return error.InvalidCpuArch; + return error.InvalidMachineType; } const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds); @@ -1648,12 +1648,12 @@ pub fn parseAr(self: *Object, macho_file: *MachO) !void { macho.CPU_TYPE_X86_64 => .x86_64, else => |x| { try macho_file.reportParseError2(self.index, "unknown cpu architecture: {d}", .{x}); - return error.InvalidCpuArch; + return error.InvalidMachineType; }, }; if (macho_file.getTarget().cpu.arch != this_cpu_arch) { try macho_file.reportParseError2(self.index, "invalid cpu architecture: {s}", .{@tagName(this_cpu_arch)}); - return error.InvalidCpuArch; + return error.InvalidMachineType; } const lc_buffer = try gpa.alloc(u8, self.header.?.sizeofcmds); diff --git a/src/link/MachO/relocatable.zig b/src/link/MachO/relocatable.zig index e18442b6c2d7..e231360928bf 100644 --- a/src/link/MachO/relocatable.zig +++ b/src/link/MachO/relocatable.zig @@ -232,7 +232,7 @@ fn parseInputFilesAr(macho_file: *MachO) !void { for (macho_file.objects.items) |index| { macho_file.getFile(index).?.parseAr(macho_file) catch |err| switch (err) { - error.InvalidCpuArch => {}, // already reported + error.InvalidMachineType => {}, // already reported else => |e| try macho_file.reportParseError2(index, "unexpected error: parsing input file failed with error {s}", .{@errorName(e)}), }; }