From c1a70acc916b7278a3f7702d6712b20ecbbb62a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Sun, 25 Aug 2024 00:53:24 +0200 Subject: [PATCH] std.zig.target: Split `mips(el)-linux-musl` triples into `mips(el)-linux-musleabi(hf)`. Closes #21184. --- lib/std/zig/target.zig | 6 ++++-- test/tests.zig | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/std/zig/target.zig b/lib/std/zig/target.zig index d0d68acd70..f28904a65c 100644 --- a/lib/std/zig/target.zig +++ b/lib/std/zig/target.zig @@ -46,10 +46,12 @@ pub const available_libcs = [_]ArchOsAbi{ .{ .arch = .mips64, .os = .linux, .abi = .musl }, .{ .arch = .mipsel, .os = .linux, .abi = .gnueabi }, .{ .arch = .mipsel, .os = .linux, .abi = .gnueabihf }, - .{ .arch = .mipsel, .os = .linux, .abi = .musl }, + .{ .arch = .mipsel, .os = .linux, .abi = .musleabi }, + .{ .arch = .mipsel, .os = .linux, .abi = .musleabihf }, .{ .arch = .mips, .os = .linux, .abi = .gnueabi }, .{ .arch = .mips, .os = .linux, .abi = .gnueabihf }, - .{ .arch = .mips, .os = .linux, .abi = .musl }, + .{ .arch = .mips, .os = .linux, .abi = .musleabi }, + .{ .arch = .mips, .os = .linux, .abi = .musleabihf }, .{ .arch = .powerpc64le, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 19, .patch = 0 } }, .{ .arch = .powerpc64le, .os = .linux, .abi = .musl }, .{ .arch = .powerpc64, .os = .linux, .abi = .gnu }, diff --git a/test/tests.zig b/test/tests.zig index 7d5be7bbf7..6733c52de6 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -323,7 +323,7 @@ const test_targets = blk: { .target = .{ .cpu_arch = .mips, .os_tag = .linux, - .abi = .musl, + .abi = .musleabihf, }, .link_libc = true, .slow_backend = true, @@ -350,7 +350,7 @@ const test_targets = blk: { .target = .{ .cpu_arch = .mipsel, .os_tag = .linux, - .abi = .musl, + .abi = .musleabihf, }, .link_libc = true, .slow_backend = true, @@ -661,7 +661,7 @@ const c_abi_targets = [_]CAbiTarget{ .target = .{ .cpu_arch = .mips, .os_tag = .linux, - .abi = .musl, + .abi = .musleabihf, }, }, .{