| ... | ... | @@ -95,7 +95,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: std.Progre |
| 95 | 95 | }); |
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | | } else if (target.cpu.arch.isARM()) { |
| 98 | } else if (target.cpu.arch.isThumb()) { |
| 99 | 99 | for (mingw32_arm32_src) |dep| { |
| 100 | 100 | try c_source_files.append(.{ |
| 101 | 101 | .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ |
| ... | ... | @@ -139,7 +139,7 @@ fn add_cc_args( |
| 139 | 139 | }); |
| 140 | 140 | |
| 141 | 141 | const target = comp.getTarget(); |
| 142 | | if (target.cpu.arch.isARM() and target.ptrBitWidth() == 32) { |
| 142 | if (target.cpu.arch.isThumb()) { |
| 143 | 143 | try args.append("-mfpu=vfp"); |
| 144 | 144 | } |
| 145 | 145 | |
| ... | ... | @@ -222,10 +222,10 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void { |
| 222 | 222 | }); |
| 223 | 223 | |
| 224 | 224 | const target_defines = switch (target.cpu.arch) { |
| 225 | .thumb => "#define DEF_ARM32\n", |
| 226 | .aarch64 => "#define DEF_ARM64\n", |
| 225 | 227 | .x86 => "#define DEF_I386\n", |
| 226 | 228 | .x86_64 => "#define DEF_X64\n", |
| 227 | | .arm, .armeb, .thumb, .thumbeb => "#define DEF_ARM32\n", |
| 228 | | .aarch64, .aarch64_be => "#define DEF_ARM64\n", |
| 229 | 229 | else => unreachable, |
| 230 | 230 | }; |
| 231 | 231 | |
| ... | ... | @@ -321,10 +321,10 @@ fn findDef( |
| 321 | 321 | lib_name: []const u8, |
| 322 | 322 | ) ![]u8 { |
| 323 | 323 | const lib_path = switch (target.cpu.arch) { |
| 324 | .thumb => "libarm32", |
| 325 | .aarch64 => "libarm64", |
| 324 | 326 | .x86 => "lib32", |
| 325 | 327 | .x86_64 => "lib64", |
| 326 | | .arm, .armeb, .thumb, .thumbeb => "libarm32", |
| 327 | | .aarch64, .aarch64_be => "libarm64", |
| 328 | 328 | else => unreachable, |
| 329 | 329 | }; |
| 330 | 330 | |
Alex Rønne Petersen <alex@alexrp.com> 2024-08-21 14:25:08+02:00
Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM
src