authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-05-06 04:24:24+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-05-08 21:32:20+02:00
logd3e85412689ad3f53e2bfcd1b1ede4f02b77598f
tree97fd692e5702341c30fe24b5118fe21dc060a283
parent35f30558ad2836b83859d8ba64a593a0603d4e0e
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

std.Target: Prune dead targets in Abi.default() and DynamicLinker.standard().

1 files changed, 8 insertions(+), 28 deletions(-)

lib/std/Target.zig+8-28
...@@ -838,7 +838,6 @@ pub const Abi = enum {...@@ -838,7 +838,6 @@ pub const Abi = enum {
838 .aix => if (arch == .powerpc) .eabihf else .none,838 .aix => if (arch == .powerpc) .eabihf else .none,
839 .haiku => switch (arch) {839 .haiku => switch (arch) {
840 .arm,840 .arm,
841 .thumb,
842 .powerpc,841 .powerpc,
843 => .eabihf,842 => .eabihf,
844 else => .none,843 else => .none,
...@@ -877,22 +876,13 @@ pub const Abi = enum {...@@ -877,22 +876,13 @@ pub const Abi = enum {
877 },876 },
878 .freebsd => switch (arch) {877 .freebsd => switch (arch) {
879 .arm,878 .arm,
880 .armeb,
881 .thumb,
882 .thumbeb,
883 .powerpc,879 .powerpc,
884 => .eabihf,880 => .eabihf,
885 // Soft float tends to be more common for MIPS.
886 .mips,
887 .mipsel,
888 => .eabi,
889 else => .none,881 else => .none,
890 },882 },
891 .netbsd => switch (arch) {883 .netbsd => switch (arch) {
892 .arm,884 .arm,
893 .armeb,885 .armeb,
894 .thumb,
895 .thumbeb,
896 .powerpc,886 .powerpc,
897 => .eabihf,887 => .eabihf,
898 // Soft float tends to be more common for MIPS.888 // Soft float tends to be more common for MIPS.
...@@ -903,7 +893,6 @@ pub const Abi = enum {...@@ -903,7 +893,6 @@ pub const Abi = enum {
903 },893 },
904 .openbsd => switch (arch) {894 .openbsd => switch (arch) {
905 .arm,895 .arm,
906 .thumb,
907 => .eabi,896 => .eabi,
908 .powerpc,897 .powerpc,
909 => .eabihf,898 => .eabihf,
...@@ -2209,7 +2198,6 @@ pub const DynamicLinker = struct {...@@ -2209,7 +2198,6 @@ pub const DynamicLinker = struct {
22092198
2210 .haiku => switch (cpu.arch) {2199 .haiku => switch (cpu.arch) {
2211 .arm,2200 .arm,
2212 .thumb,
2213 .aarch64,2201 .aarch64,
2214 .m68k,2202 .m68k,
2215 .powerpc,2203 .powerpc,
...@@ -2238,9 +2226,7 @@ pub const DynamicLinker = struct {...@@ -2238,9 +2226,7 @@ pub const DynamicLinker = struct {
22382226
2239 .linux => if (abi.isAndroid())2227 .linux => if (abi.isAndroid())
2240 switch (cpu.arch) {2228 switch (cpu.arch) {
2241 .arm,2229 .arm => if (abi == .androideabi) init("/system/bin/linker") else none,
2242 .thumb,
2243 => if (abi == .androideabi) init("/system/bin/linker") else none,
22442230
2245 .aarch64,2231 .aarch64,
2246 .riscv64,2232 .riscv64,
...@@ -2458,19 +2444,11 @@ pub const DynamicLinker = struct {...@@ -2458,19 +2444,11 @@ pub const DynamicLinker = struct {
24582444
2459 .freebsd => switch (cpu.arch) {2445 .freebsd => switch (cpu.arch) {
2460 .arm,2446 .arm,
2461 .armeb,
2462 .thumb,
2463 .thumbeb,
2464 .aarch64,2447 .aarch64,
2465 .mips,
2466 .mipsel,
2467 .mips64,
2468 .mips64el,
2469 .powerpc,2448 .powerpc,
2470 .powerpc64,2449 .powerpc64,
2471 .powerpc64le,2450 .powerpc64le,
2472 .riscv64,2451 .riscv64,
2473 .sparc64,
2474 .x86,2452 .x86,
2475 .x86_64,2453 .x86_64,
2476 => initFmt("{s}/libexec/ld-elf.so.1", .{2454 => initFmt("{s}/libexec/ld-elf.so.1", .{
...@@ -2485,8 +2463,6 @@ pub const DynamicLinker = struct {...@@ -2485,8 +2463,6 @@ pub const DynamicLinker = struct {
2485 .netbsd => switch (cpu.arch) {2463 .netbsd => switch (cpu.arch) {
2486 .arm,2464 .arm,
2487 .armeb,2465 .armeb,
2488 .thumb,
2489 .thumbeb,
2490 .aarch64,2466 .aarch64,
2491 .aarch64_be,2467 .aarch64_be,
2492 .m68k,2468 .m68k,
...@@ -2506,7 +2482,6 @@ pub const DynamicLinker = struct {...@@ -2506,7 +2482,6 @@ pub const DynamicLinker = struct {
25062482
2507 .openbsd => switch (cpu.arch) {2483 .openbsd => switch (cpu.arch) {
2508 .arm,2484 .arm,
2509 .thumb,
2510 .aarch64,2485 .aarch64,
2511 .mips64,2486 .mips64,
2512 .mips64el,2487 .mips64el,
...@@ -2534,11 +2509,16 @@ pub const DynamicLinker = struct {...@@ -2534,11 +2509,16 @@ pub const DynamicLinker = struct {
2534 },2509 },
25352510
2536 .illumos,2511 .illumos,
2512 => switch (cpu.arch) {
2513 .x86,
2514 .x86_64,
2515 => initFmt("/lib/{s}ld.so.1", .{if (ptrBitWidth_cpu_abi(cpu, .none) == 64) "64/" else ""}),
2516 else => none,
2517 },
2518
2537 .solaris,2519 .solaris,
2538 => switch (cpu.arch) {2520 => switch (cpu.arch) {
2539 .sparc,
2540 .sparc64,2521 .sparc64,
2541 .x86,
2542 .x86_64,2522 .x86_64,
2543 => initFmt("/lib/{s}ld.so.1", .{if (ptrBitWidth_cpu_abi(cpu, .none) == 64) "64/" else ""}),2523 => initFmt("/lib/{s}ld.so.1", .{if (ptrBitWidth_cpu_abi(cpu, .none) == 64) "64/" else ""}),
2544 else => none,2524 else => none,