| ... | @@ -2467,6 +2467,7 @@ pub const DynamicLinker = struct { | ... | @@ -2467,6 +2467,7 @@ pub const DynamicLinker = struct { |
| 2467 | pub fn kind(os: Os.Tag) Kind { | 2467 | pub fn kind(os: Os.Tag) Kind { |
| 2468 | return switch (os) { | 2468 | return switch (os) { |
| 2469 | .fuchsia, | 2469 | .fuchsia, |
| | 2470 | .managarm, |
| 2470 | | 2471 | |
| 2471 | .haiku, | 2472 | .haiku, |
| 2472 | .illumos, | 2473 | .illumos, |
| ... | @@ -2485,15 +2486,16 @@ pub const DynamicLinker = struct { | ... | @@ -2485,15 +2486,16 @@ pub const DynamicLinker = struct { |
| 2485 | .visionos, | 2486 | .visionos, |
| 2486 | .watchos, | 2487 | .watchos, |
| 2487 | => .arch_os, | 2488 | => .arch_os, |
| | 2489 | |
| 2488 | .hurd, | 2490 | .hurd, |
| 2489 | .linux, | 2491 | .linux, |
| 2490 | => .arch_os_abi, | 2492 | => .arch_os_abi, |
| | 2493 | |
| 2491 | .freestanding, | 2494 | .freestanding, |
| 2492 | .other, | 2495 | .other, |
| 2493 | | 2496 | |
| 2494 | .contiki, | 2497 | .contiki, |
| 2495 | .hermit, | 2498 | .hermit, |
| 2496 | .managarm, // Needs to be double-checked. | | |
| 2497 | | 2499 | |
| 2498 | .plan9, | 2500 | .plan9, |
| 2499 | .rtems, | 2501 | .rtems, |
| ... | @@ -2555,6 +2557,13 @@ pub const DynamicLinker = struct { | ... | @@ -2555,6 +2557,13 @@ pub const DynamicLinker = struct { |
| 2555 | else => none, | 2557 | else => none, |
| 2556 | }, | 2558 | }, |
| 2557 | | 2559 | |
| | 2560 | .managarm => switch (cpu.arch) { |
| | 2561 | .aarch64 => init("/lib/aarch64-managarm-mlibc-ld.so"), |
| | 2562 | .riscv64 => init("/lib/riscv64-managarm-mlibc-ld.so"), |
| | 2563 | .x86_64 => init("/lib/x86_64-managarm-mlibc-ld.so"), |
| | 2564 | else => none, |
| | 2565 | }, |
| | 2566 | |
| 2558 | .haiku => switch (cpu.arch) { | 2567 | .haiku => switch (cpu.arch) { |
| 2559 | .arm, | 2568 | .arm, |
| 2560 | .aarch64, | 2569 | .aarch64, |
| ... | @@ -2958,8 +2967,6 @@ pub const DynamicLinker = struct { | ... | @@ -2958,8 +2967,6 @@ pub const DynamicLinker = struct { |
| 2958 | | 2967 | |
| 2959 | // TODO go over each item in this list and either move it to the above list, or | 2968 | // TODO go over each item in this list and either move it to the above list, or |
| 2960 | // implement the standard dynamic linker path code for it. | 2969 | // implement the standard dynamic linker path code for it. |
| 2961 | .managarm, | | |
| 2962 | | | |
| 2963 | .ps3, | 2970 | .ps3, |
| 2964 | .ps4, | 2971 | .ps4, |
| 2965 | .ps5, | 2972 | .ps5, |