| author |  Alex Rønne Petersen <alex@alexrp.com> 2024-10-16 06:30:16+02:00 |
| committer | Alex Rønne Petersen <alex@alexrp.com> 2024-11-02 10:42:53+01:00 |
| log | 11915ae48e44cfd9d4e5c5823919fb24951e68f9 |
| tree | 8032757cbc2c166afdcea1fd072f492e655af81d |
| parent | 8baf887f4edc07aea8aa028cb1d866a5a5206508 |
| signature |  Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM |
std.zig.target: Change mips64(el)-linux-musl triples to -muslabi64.
With this, MIPS triples for musl are in line with glibc triples.3 files changed, 4 insertions(+), 6 deletions(-)
lib- std
- zig
lib/std/zig/target.zig+2-2
| ... | @@ -46,11 +46,11 @@ pub const available_libcs = [_]ArchOsAbi{ | ... | @@ -46,11 +46,11 @@ pub const available_libcs = [_]ArchOsAbi{ |
| 46 | .{ .arch = .mipsel, .os = .linux, .abi = .musleabihf }, | 46 | .{ .arch = .mipsel, .os = .linux, .abi = .musleabihf }, |
| 47 | .{ .arch = .mips64, .os = .linux, .abi = .gnuabi64 }, | 47 | .{ .arch = .mips64, .os = .linux, .abi = .gnuabi64 }, |
| 48 | .{ .arch = .mips64, .os = .linux, .abi = .gnuabin32 }, | 48 | .{ .arch = .mips64, .os = .linux, .abi = .gnuabin32 }, |
| 49 | .{ .arch = .mips64, .os = .linux, .abi = .musl }, | 49 | .{ .arch = .mips64, .os = .linux, .abi = .muslabi64 }, |
| 50 | .{ .arch = .mips64, .os = .linux, .abi = .muslabin32 }, | 50 | .{ .arch = .mips64, .os = .linux, .abi = .muslabin32 }, |
| 51 | .{ .arch = .mips64el, .os = .linux, .abi = .gnuabi64 }, | 51 | .{ .arch = .mips64el, .os = .linux, .abi = .gnuabi64 }, |
| 52 | .{ .arch = .mips64el, .os = .linux, .abi = .gnuabin32 }, | 52 | .{ .arch = .mips64el, .os = .linux, .abi = .gnuabin32 }, |
| 53 | .{ .arch = .mips64el, .os = .linux, .abi = .musl }, | 53 | .{ .arch = .mips64el, .os = .linux, .abi = .muslabi64 }, |
| 54 | .{ .arch = .mips64el, .os = .linux, .abi = .muslabin32 }, | 54 | .{ .arch = .mips64el, .os = .linux, .abi = .muslabin32 }, |
| 55 | .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi }, | 55 | .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi }, |
| 56 | .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf }, | 56 | .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf }, |
test/llvm_targets.zig-2
| ... | @@ -160,7 +160,6 @@ const targets = [_]std.Target.Query{ | ... | @@ -160,7 +160,6 @@ const targets = [_]std.Target.Query{ |
| 160 | .{ .cpu_arch = .mips64, .os_tag = .freestanding, .abi = .none }, | 160 | .{ .cpu_arch = .mips64, .os_tag = .freestanding, .abi = .none }, |
| 161 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .gnuabi64 }, | 161 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .gnuabi64 }, |
| 162 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .gnuabin32 }, | 162 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .gnuabin32 }, |
| 163 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .musl }, | ||
| 164 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .muslabi64 }, | 163 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .muslabi64 }, |
| 165 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .muslabin32 }, | 164 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .muslabin32 }, |
| 166 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .none }, | 165 | .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .none }, |
| ... | @@ -171,7 +170,6 @@ const targets = [_]std.Target.Query{ | ... | @@ -171,7 +170,6 @@ const targets = [_]std.Target.Query{ |
| 171 | .{ .cpu_arch = .mips64el, .os_tag = .freestanding, .abi = .none }, | 170 | .{ .cpu_arch = .mips64el, .os_tag = .freestanding, .abi = .none }, |
| 172 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .gnuabi64 }, | 171 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .gnuabi64 }, |
| 173 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .gnuabin32 }, | 172 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .gnuabin32 }, |
| 174 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .musl }, | ||
| 175 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .muslabi64 }, | 173 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .muslabi64 }, |
| 176 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .muslabin32 }, | 174 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .muslabin32 }, |
| 177 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .none }, | 175 | .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .none }, |
test/tests.zig+2-2
| ... | @@ -454,7 +454,7 @@ const test_targets = blk: { | ... | @@ -454,7 +454,7 @@ const test_targets = blk: { |
| 454 | .target = .{ | 454 | .target = .{ |
| 455 | .cpu_arch = .mips64, | 455 | .cpu_arch = .mips64, |
| 456 | .os_tag = .linux, | 456 | .os_tag = .linux, |
| 457 | .abi = .musl, | 457 | .abi = .muslabi64, |
| 458 | }, | 458 | }, |
| 459 | .link_libc = true, | 459 | .link_libc = true, |
| 460 | }, | 460 | }, |
| ... | @@ -478,7 +478,7 @@ const test_targets = blk: { | ... | @@ -478,7 +478,7 @@ const test_targets = blk: { |
| 478 | .target = .{ | 478 | .target = .{ |
| 479 | .cpu_arch = .mips64el, | 479 | .cpu_arch = .mips64el, |
| 480 | .os_tag = .linux, | 480 | .os_tag = .linux, |
| 481 | .abi = .musl, | 481 | .abi = .muslabi64, |
| 482 | }, | 482 | }, |
| 483 | .link_libc = true, | 483 | .link_libc = true, |
| 484 | }, | 484 | }, |