diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2024-10-16 06:30:16 +0200 |
|---|---|---|
| committer | Alex Rønne Petersen <alex@alexrp.com> | 2024-11-02 10:42:53 +0100 |
| commit | 11915ae48e44cfd9d4e5c5823919fb24951e68f9 (patch) | |
| tree | 8032757cbc2c166afdcea1fd072f492e655af81d | |
| parent | 8baf887f4edc07aea8aa028cb1d866a5a5206508 (diff) | |
| download | zig-11915ae48e44cfd9d4e5c5823919fb24951e68f9.tar.gz zig-11915ae48e44cfd9d4e5c5823919fb24951e68f9.zip | |
std.zig.target: Change mips64(el)-linux-musl triples to -muslabi64.
With this, MIPS triples for musl are in line with glibc triples.
| -rw-r--r-- | lib/std/zig/target.zig | 4 | ||||
| -rw-r--r-- | test/llvm_targets.zig | 2 | ||||
| -rw-r--r-- | test/tests.zig | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/lib/std/zig/target.zig b/lib/std/zig/target.zig index 7ffce4f455..c72b221936 100644 --- a/lib/std/zig/target.zig +++ b/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 }, diff --git a/test/llvm_targets.zig b/test/llvm_targets.zig index 7cf7d3e8d9..f3de404337 100644 --- a/test/llvm_targets.zig +++ b/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 }, diff --git a/test/tests.zig b/test/tests.zig index a9035560b3..8bcb31a7c8 100644 --- a/test/tests.zig +++ b/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, }, |