Skip to content

Commit c1a70ac

Browse files
committed
std.zig.target: Split mips(el)-linux-musl triples into mips(el)-linux-musleabi(hf).
Closes #21184.
1 parent f29bdd6 commit c1a70ac

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

lib/std/zig/target.zig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ pub const available_libcs = [_]ArchOsAbi{
4646
.{ .arch = .mips64, .os = .linux, .abi = .musl },
4747
.{ .arch = .mipsel, .os = .linux, .abi = .gnueabi },
4848
.{ .arch = .mipsel, .os = .linux, .abi = .gnueabihf },
49-
.{ .arch = .mipsel, .os = .linux, .abi = .musl },
49+
.{ .arch = .mipsel, .os = .linux, .abi = .musleabi },
50+
.{ .arch = .mipsel, .os = .linux, .abi = .musleabihf },
5051
.{ .arch = .mips, .os = .linux, .abi = .gnueabi },
5152
.{ .arch = .mips, .os = .linux, .abi = .gnueabihf },
52-
.{ .arch = .mips, .os = .linux, .abi = .musl },
53+
.{ .arch = .mips, .os = .linux, .abi = .musleabi },
54+
.{ .arch = .mips, .os = .linux, .abi = .musleabihf },
5355
.{ .arch = .powerpc64le, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 19, .patch = 0 } },
5456
.{ .arch = .powerpc64le, .os = .linux, .abi = .musl },
5557
.{ .arch = .powerpc64, .os = .linux, .abi = .gnu },

test/tests.zig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ const test_targets = blk: {
323323
.target = .{
324324
.cpu_arch = .mips,
325325
.os_tag = .linux,
326-
.abi = .musl,
326+
.abi = .musleabihf,
327327
},
328328
.link_libc = true,
329329
.slow_backend = true,
@@ -350,7 +350,7 @@ const test_targets = blk: {
350350
.target = .{
351351
.cpu_arch = .mipsel,
352352
.os_tag = .linux,
353-
.abi = .musl,
353+
.abi = .musleabihf,
354354
},
355355
.link_libc = true,
356356
.slow_backend = true,
@@ -661,7 +661,7 @@ const c_abi_targets = [_]CAbiTarget{
661661
.target = .{
662662
.cpu_arch = .mips,
663663
.os_tag = .linux,
664-
.abi = .musl,
664+
.abi = .musleabihf,
665665
},
666666
},
667667
.{

0 commit comments

Comments
 (0)