Skip to content

Commit e1f3fc6

Browse files
committed
Coff2: create a new linker from scratch
1 parent d5f09f5 commit e1f3fc6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3484
-902
lines changed

lib/std/Target.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ pub fn toElfMachine(target: *const Target) std.elf.EM {
10821082
};
10831083
}
10841084

1085-
pub fn toCoffMachine(target: *const Target) std.coff.MachineType {
1085+
pub fn toCoffMachine(target: *const Target) std.coff.IMAGE.FILE.MACHINE {
10861086
return switch (target.cpu.arch) {
10871087
.arm => .ARM,
10881088
.thumb => .ARMNT,
@@ -1092,7 +1092,7 @@ pub fn toCoffMachine(target: *const Target) std.coff.MachineType {
10921092
.riscv32 => .RISCV32,
10931093
.riscv64 => .RISCV64,
10941094
.x86 => .I386,
1095-
.x86_64 => .X64,
1095+
.x86_64 => .AMD64,
10961096

10971097
.amdgcn,
10981098
.arc,

lib/std/array_hash_map.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub fn eqlString(a: []const u8, b: []const u8) bool {
5050
}
5151

5252
pub fn hashString(s: []const u8) u32 {
53-
return @as(u32, @truncate(std.hash.Wyhash.hash(0, s)));
53+
return @truncate(std.hash.Wyhash.hash(0, s));
5454
}
5555

5656
/// Deprecated in favor of `ArrayHashMapWithAllocator` (no code changes needed)

0 commit comments

Comments
 (0)