diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2025-05-11 20:52:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-11 20:52:47 +0200 |
| commit | c3906718b343c20e4021e68e68a9c163a98c2741 (patch) | |
| tree | bcdd69a2fd160842f5a72a7a054d8fae042b35ab /lib/std/Target.zig | |
| parent | 837e0f9c377d66f323926427551cc7db84a7151d (diff) | |
| parent | 23cb2b26626dafacfc5e0b567a43b88e1a22fe18 (diff) | |
| download | zig-c3906718b343c20e4021e68e68a9c163a98c2741.tar.gz zig-c3906718b343c20e4021e68e68a9c163a98c2741.zip | |
Merge pull request #23810 from alexrp/more-test-targets
Diffstat (limited to 'lib/std/Target.zig')
| -rw-r--r-- | lib/std/Target.zig | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/lib/std/Target.zig b/lib/std/Target.zig index dcce4f1dd8..908147c089 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -838,7 +838,6 @@ pub const Abi = enum { .aix => if (arch == .powerpc) .eabihf else .none, .haiku => switch (arch) { .arm, - .thumb, .powerpc, => .eabihf, else => .none, @@ -877,22 +876,13 @@ pub const Abi = enum { }, .freebsd => switch (arch) { .arm, - .armeb, - .thumb, - .thumbeb, .powerpc, => .eabihf, - // Soft float tends to be more common for MIPS. - .mips, - .mipsel, - => .eabi, else => .none, }, .netbsd => switch (arch) { .arm, .armeb, - .thumb, - .thumbeb, .powerpc, => .eabihf, // Soft float tends to be more common for MIPS. @@ -903,7 +893,6 @@ pub const Abi = enum { }, .openbsd => switch (arch) { .arm, - .thumb, => .eabi, .powerpc, => .eabihf, @@ -2205,7 +2194,6 @@ pub const DynamicLinker = struct { .haiku => switch (cpu.arch) { .arm, - .thumb, .aarch64, .m68k, .powerpc, @@ -2234,9 +2222,7 @@ pub const DynamicLinker = struct { .linux => if (abi.isAndroid()) switch (cpu.arch) { - .arm, - .thumb, - => if (abi == .androideabi) init("/system/bin/linker") else none, + .arm => if (abi == .androideabi) init("/system/bin/linker") else none, .aarch64, .riscv64, @@ -2454,19 +2440,11 @@ pub const DynamicLinker = struct { .freebsd => switch (cpu.arch) { .arm, - .armeb, - .thumb, - .thumbeb, .aarch64, - .mips, - .mipsel, - .mips64, - .mips64el, .powerpc, .powerpc64, .powerpc64le, .riscv64, - .sparc64, .x86, .x86_64, => initFmt("{s}/libexec/ld-elf.so.1", .{ @@ -2481,8 +2459,6 @@ pub const DynamicLinker = struct { .netbsd => switch (cpu.arch) { .arm, .armeb, - .thumb, - .thumbeb, .aarch64, .aarch64_be, .m68k, @@ -2491,6 +2467,8 @@ pub const DynamicLinker = struct { .mips64, .mips64el, .powerpc, + .powerpc64, + .riscv32, .riscv64, .sparc, .sparc64, @@ -2502,7 +2480,6 @@ pub const DynamicLinker = struct { .openbsd => switch (cpu.arch) { .arm, - .thumb, .aarch64, .mips64, .mips64el, @@ -2530,11 +2507,16 @@ pub const DynamicLinker = struct { }, .illumos, + => switch (cpu.arch) { + .x86, + .x86_64, + => initFmt("/lib/{s}ld.so.1", .{if (ptrBitWidth_cpu_abi(cpu, .none) == 64) "64/" else ""}), + else => none, + }, + .solaris, => switch (cpu.arch) { - .sparc, .sparc64, - .x86, .x86_64, => initFmt("/lib/{s}ld.so.1", .{if (ptrBitWidth_cpu_abi(cpu, .none) == 64) "64/" else ""}), else => none, |