Commit 11915ae48e

Alex Rønne Petersen <alex@alexrp.com>
2024-10-16 06:30:16
std.zig.target: Change mips64(el)-linux-musl triples to -muslabi64.
With this, MIPS triples for musl are in line with glibc triples.
master
1 parent 8baf887
Changed files (3)
lib
std
zig
target.zig
test
llvm_targets.zig
tests.zig
lib/std/zig/target.zig
@@ -46,11 +46,11 @@ pub const available_libcs = [_]ArchOsAbi{
     .{ .arch = .mipsel, .os = .linux, .abi = .musleabihf },
     .{ .arch = .mips64, .os = .linux, .abi = .gnuabi64 },
     .{ .arch = .mips64, .os = .linux, .abi = .gnuabin32 },
-    .{ .arch = .mips64, .os = .linux, .abi = .musl },
+    .{ .arch = .mips64, .os = .linux, .abi = .muslabi64 },
     .{ .arch = .mips64, .os = .linux, .abi = .muslabin32 },
     .{ .arch = .mips64el, .os = .linux, .abi = .gnuabi64 },
     .{ .arch = .mips64el, .os = .linux, .abi = .gnuabin32 },
-    .{ .arch = .mips64el, .os = .linux, .abi = .musl },
+    .{ .arch = .mips64el, .os = .linux, .abi = .muslabi64 },
     .{ .arch = .mips64el, .os = .linux, .abi = .muslabin32 },
     .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi },
     .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf },
test/llvm_targets.zig
@@ -160,7 +160,6 @@ const targets = [_]std.Target.Query{
     .{ .cpu_arch = .mips64, .os_tag = .freestanding, .abi = .none },
     .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .gnuabi64 },
     .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .gnuabin32 },
-    .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .musl },
     .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .muslabi64 },
     .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .muslabin32 },
     .{ .cpu_arch = .mips64, .os_tag = .linux, .abi = .none },
@@ -171,7 +170,6 @@ const targets = [_]std.Target.Query{
     .{ .cpu_arch = .mips64el, .os_tag = .freestanding, .abi = .none },
     .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .gnuabi64 },
     .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .gnuabin32 },
-    .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .musl },
     .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .muslabi64 },
     .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .muslabin32 },
     .{ .cpu_arch = .mips64el, .os_tag = .linux, .abi = .none },
test/tests.zig
@@ -454,7 +454,7 @@ const test_targets = blk: {
             .target = .{
                 .cpu_arch = .mips64,
                 .os_tag = .linux,
-                .abi = .musl,
+                .abi = .muslabi64,
             },
             .link_libc = true,
         },
@@ -478,7 +478,7 @@ const test_targets = blk: {
             .target = .{
                 .cpu_arch = .mips64el,
                 .os_tag = .linux,
-                .abi = .musl,
+                .abi = .muslabi64,
             },
             .link_libc = true,
         },