authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-16 06:30:16+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-11-02 10:42:53+01:00
log11915ae48e44cfd9d4e5c5823919fb24951e68f9
tree8032757cbc2c166afdcea1fd072f492e655af81d
parent8baf887f4edc07aea8aa028cb1d866a5a5206508
signaturebadge-check 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/target.zig+2-2
......@@ -46,11 +46,11 @@ pub const available_libcs = [_]ArchOsAbi{
4646 .{ .arch = .mipsel, .os = .linux, .abi = .musleabihf },
4747 .{ .arch = .mips64, .os = .linux, .abi = .gnuabi64 },
4848 .{ .arch = .mips64, .os = .linux, .abi = .gnuabin32 },
49 .{ .arch = .mips64, .os = .linux, .abi = .musl },
49 .{ .arch = .mips64, .os = .linux, .abi = .muslabi64 },
5050 .{ .arch = .mips64, .os = .linux, .abi = .muslabin32 },
5151 .{ .arch = .mips64el, .os = .linux, .abi = .gnuabi64 },
5252 .{ .arch = .mips64el, .os = .linux, .abi = .gnuabin32 },
53 .{ .arch = .mips64el, .os = .linux, .abi = .musl },
53 .{ .arch = .mips64el, .os = .linux, .abi = .muslabi64 },
5454 .{ .arch = .mips64el, .os = .linux, .abi = .muslabin32 },
5555 .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi },
5656 .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf },
test/llvm_targets.zig-2
......@@ -160,7 +160,6 @@ const targets = [_]std.Target.Query{
160160 .{ .cpu_arch = .mips64, .os_tag = .freestanding, .abi = .none },
161161 .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .gnuabi64 },
162162 .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .gnuabin32 },
163 .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .musl },
164163 .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .muslabi64 },
165164 .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .muslabin32 },
166165 .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .none },
......@@ -171,7 +170,6 @@ const targets = [_]std.Target.Query{
171170 .{ .cpu_arch = .mips64el, .os_tag = .freestanding, .abi = .none },
172171 .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .gnuabi64 },
173172 .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .gnuabin32 },
174 .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .musl },
175173 .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .muslabi64 },
176174 .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .muslabin32 },
177175 .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .none },
test/tests.zig+2-2
......@@ -454,7 +454,7 @@ const test_targets = blk: {
454454 .target = .{
455455 .cpu_arch = .mips64,
456456 .os_tag = .linux,
457 .abi = .musl,
457 .abi = .muslabi64,
458458 },
459459 .link_libc = true,
460460 },
......@@ -478,7 +478,7 @@ const test_targets = blk: {
478478 .target = .{
479479 .cpu_arch = .mips64el,
480480 .os_tag = .linux,
481 .abi = .musl,
481 .abi = .muslabi64,
482482 },
483483 .link_libc = true,
484484 },