diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2024-11-03 14:25:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-03 14:25:30 +0100 |
| commit | 2f003f39b28176f08de51271eb66b5f3a54c7aae (patch) | |
| tree | 8aa5be07f5749b49a2103bda726771473f29bbbd /src/link | |
| parent | 947b7195bf4628cc4658fec9e2f5b30a1318132b (diff) | |
| parent | 621487d5abcf9006b3e38f96c49a533c1835e7a3 (diff) | |
| download | zig-2f003f39b28176f08de51271eb66b5f3a54c7aae.tar.gz zig-2f003f39b28176f08de51271eb66b5f3a54c7aae.zip | |
Merge pull request #21599 from alexrp/thumb-porting
Diffstat (limited to 'src/link')
| -rw-r--r-- | src/link/Coff.zig | 10 | ||||
| -rw-r--r-- | src/link/Elf.zig | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/link/Coff.zig b/src/link/Coff.zig index bc88f5fc4c..a52892409a 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -1865,12 +1865,10 @@ fn linkWithLLD(coff: *Coff, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: try argv.append("-MACHINE:X86"); } else if (target.cpu.arch == .x86_64) { try argv.append("-MACHINE:X64"); - } else if (target.cpu.arch.isARM()) { - if (target.ptrBitWidth() == 32) { - try argv.append("-MACHINE:ARM"); - } else { - try argv.append("-MACHINE:ARM64"); - } + } else if (target.cpu.arch == .thumb) { + try argv.append("-MACHINE:ARM"); + } else if (target.cpu.arch == .aarch64) { + try argv.append("-MACHINE:ARM64"); } for (comp.force_undefined_symbols.keys()) |symbol| { diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 840ea02f5d..8f39d3412f 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -1823,7 +1823,7 @@ fn linkWithLLD(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: s } if (link_mode == .static) { - if (target.cpu.arch.isArmOrThumb()) { + if (target.cpu.arch.isArm()) { try argv.append("-Bstatic"); } else { try argv.append("-static"); |