authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-15 20:02:22+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-16 00:33:23+02:00
log1efc9c149c8310802a1fb9bb15024079e033ef5e
treee492272503d995ab99083bf6e811677ad2356056
parent7b8fc18c666ba6952ad1571fbed4cc48e81f647d

std.zig.target: Sort the target triple list in a more user-friendly way.

This order should be a bit closer to what a user would expect when running `zig targets | jq -r .libc[]` or similar.

1 files changed, 29 insertions(+), 29 deletions(-)

lib/std/zig/target.zig+29-29
...@@ -9,58 +9,55 @@ pub const ArchOsAbi = struct {...@@ -9,58 +9,55 @@ pub const ArchOsAbi = struct {
9};9};
1010
11pub const available_libcs = [_]ArchOsAbi{11pub const available_libcs = [_]ArchOsAbi{
12 .{ .arch = .aarch64_be, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 17, .patch = 0 } },
13 .{ .arch = .aarch64_be, .os = .linux, .abi = .musl },
14 .{ .arch = .aarch64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 17, .patch = 0 } },
15 .{ .arch = .aarch64, .os = .linux, .abi = .musl },
16 .{ .arch = .aarch64, .os = .windows, .abi = .gnu },
17 .{ .arch = .aarch64, .os = .macos, .abi = .none, .os_ver = .{ .major = 11, .minor = 0, .patch = 0 } },
18 .{ .arch = .arc, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 32, .patch = 0 } },12 .{ .arch = .arc, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 32, .patch = 0 } },
19 .{ .arch = .armeb, .os = .linux, .abi = .gnueabi },
20 .{ .arch = .armeb, .os = .linux, .abi = .gnueabihf },
21 .{ .arch = .armeb, .os = .linux, .abi = .musleabi },
22 .{ .arch = .armeb, .os = .linux, .abi = .musleabihf },
23 .{ .arch = .arm, .os = .linux, .abi = .gnueabi },13 .{ .arch = .arm, .os = .linux, .abi = .gnueabi },
24 .{ .arch = .arm, .os = .linux, .abi = .gnueabihf },14 .{ .arch = .arm, .os = .linux, .abi = .gnueabihf },
25 .{ .arch = .arm, .os = .linux, .abi = .musleabi },15 .{ .arch = .arm, .os = .linux, .abi = .musleabi },
26 .{ .arch = .arm, .os = .linux, .abi = .musleabihf },16 .{ .arch = .arm, .os = .linux, .abi = .musleabihf },
17 .{ .arch = .armeb, .os = .linux, .abi = .gnueabi },
18 .{ .arch = .armeb, .os = .linux, .abi = .gnueabihf },
19 .{ .arch = .armeb, .os = .linux, .abi = .musleabi },
20 .{ .arch = .armeb, .os = .linux, .abi = .musleabihf },
27 .{ .arch = .thumb, .os = .linux, .abi = .musleabi },21 .{ .arch = .thumb, .os = .linux, .abi = .musleabi },
28 .{ .arch = .thumb, .os = .linux, .abi = .musleabihf },22 .{ .arch = .thumb, .os = .linux, .abi = .musleabihf },
23 .{ .arch = .thumb, .os = .windows, .abi = .gnu },
29 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabi },24 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabi },
30 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabihf },25 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabihf },
31 .{ .arch = .thumb, .os = .windows, .abi = .gnu },26 .{ .arch = .aarch64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 17, .patch = 0 } },
27 .{ .arch = .aarch64, .os = .linux, .abi = .musl },
28 .{ .arch = .aarch64, .os = .macos, .abi = .none, .os_ver = .{ .major = 11, .minor = 0, .patch = 0 } },
29 .{ .arch = .aarch64, .os = .windows, .abi = .gnu },
30 .{ .arch = .aarch64_be, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 17, .patch = 0 } },
31 .{ .arch = .aarch64_be, .os = .linux, .abi = .musl },
32 .{ .arch = .csky, .os = .linux, .abi = .gnueabi, .glibc_min = .{ .major = 2, .minor = 29, .patch = 0 } },32 .{ .arch = .csky, .os = .linux, .abi = .gnueabi, .glibc_min = .{ .major = 2, .minor = 29, .patch = 0 } },
33 .{ .arch = .csky, .os = .linux, .abi = .gnueabihf, .glibc_min = .{ .major = 2, .minor = 29, .patch = 0 } },33 .{ .arch = .csky, .os = .linux, .abi = .gnueabihf, .glibc_min = .{ .major = 2, .minor = 29, .patch = 0 } },
34 .{ .arch = .x86, .os = .linux, .abi = .gnu },
35 .{ .arch = .x86, .os = .linux, .abi = .musl },
36 .{ .arch = .x86, .os = .windows, .abi = .gnu },
37 .{ .arch = .loongarch64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 36, .patch = 0 } },34 .{ .arch = .loongarch64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 36, .patch = 0 } },
38 .{ .arch = .loongarch64, .os = .linux, .abi = .gnusf, .glibc_min = .{ .major = 2, .minor = 36, .patch = 0 } },35 .{ .arch = .loongarch64, .os = .linux, .abi = .gnusf, .glibc_min = .{ .major = 2, .minor = 36, .patch = 0 } },
39 .{ .arch = .loongarch64, .os = .linux, .abi = .musl },36 .{ .arch = .loongarch64, .os = .linux, .abi = .musl },
40 .{ .arch = .m68k, .os = .linux, .abi = .gnu },37 .{ .arch = .m68k, .os = .linux, .abi = .gnu },
41 .{ .arch = .m68k, .os = .linux, .abi = .musl },38 .{ .arch = .m68k, .os = .linux, .abi = .musl },
42 .{ .arch = .mips64el, .os = .linux, .abi = .gnuabi64 },
43 .{ .arch = .mips64el, .os = .linux, .abi = .gnuabin32 },
44 .{ .arch = .mips64el, .os = .linux, .abi = .musl },
45 .{ .arch = .mips64, .os = .linux, .abi = .gnuabi64 },
46 .{ .arch = .mips64, .os = .linux, .abi = .gnuabin32 },
47 .{ .arch = .mips64, .os = .linux, .abi = .musl },
48 .{ .arch = .mipsel, .os = .linux, .abi = .gnueabi },
49 .{ .arch = .mipsel, .os = .linux, .abi = .gnueabihf },
50 .{ .arch = .mipsel, .os = .linux, .abi = .musleabi },
51 .{ .arch = .mipsel, .os = .linux, .abi = .musleabihf },
52 .{ .arch = .mips, .os = .linux, .abi = .gnueabi },39 .{ .arch = .mips, .os = .linux, .abi = .gnueabi },
53 .{ .arch = .mips, .os = .linux, .abi = .gnueabihf },40 .{ .arch = .mips, .os = .linux, .abi = .gnueabihf },
54 .{ .arch = .mips, .os = .linux, .abi = .musleabi },41 .{ .arch = .mips, .os = .linux, .abi = .musleabi },
55 .{ .arch = .mips, .os = .linux, .abi = .musleabihf },42 .{ .arch = .mips, .os = .linux, .abi = .musleabihf },
56 .{ .arch = .powerpc64le, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 19, .patch = 0 } },43 .{ .arch = .mipsel, .os = .linux, .abi = .gnueabi },
57 .{ .arch = .powerpc64le, .os = .linux, .abi = .musl },44 .{ .arch = .mipsel, .os = .linux, .abi = .gnueabihf },
58 .{ .arch = .powerpc64, .os = .linux, .abi = .gnu },45 .{ .arch = .mipsel, .os = .linux, .abi = .musleabi },
59 .{ .arch = .powerpc64, .os = .linux, .abi = .musl },46 .{ .arch = .mipsel, .os = .linux, .abi = .musleabihf },
47 .{ .arch = .mips64, .os = .linux, .abi = .gnuabi64 },
48 .{ .arch = .mips64, .os = .linux, .abi = .gnuabin32 },
49 .{ .arch = .mips64, .os = .linux, .abi = .musl },
50 .{ .arch = .mips64el, .os = .linux, .abi = .gnuabi64 },
51 .{ .arch = .mips64el, .os = .linux, .abi = .gnuabin32 },
52 .{ .arch = .mips64el, .os = .linux, .abi = .musl },
60 .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi },53 .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi },
61 .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf },54 .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf },
62 .{ .arch = .powerpc, .os = .linux, .abi = .musleabi },55 .{ .arch = .powerpc, .os = .linux, .abi = .musleabi },
63 .{ .arch = .powerpc, .os = .linux, .abi = .musleabihf },56 .{ .arch = .powerpc, .os = .linux, .abi = .musleabihf },
57 .{ .arch = .powerpc64, .os = .linux, .abi = .gnu },
58 .{ .arch = .powerpc64, .os = .linux, .abi = .musl },
59 .{ .arch = .powerpc64le, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 19, .patch = 0 } },
60 .{ .arch = .powerpc64le, .os = .linux, .abi = .musl },
64 .{ .arch = .riscv32, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 33, .patch = 0 } },61 .{ .arch = .riscv32, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 33, .patch = 0 } },
65 .{ .arch = .riscv32, .os = .linux, .abi = .musl },62 .{ .arch = .riscv32, .os = .linux, .abi = .musl },
66 .{ .arch = .riscv64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 27, .patch = 0 } },63 .{ .arch = .riscv64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 27, .patch = 0 } },
...@@ -71,11 +68,14 @@ pub const available_libcs = [_]ArchOsAbi{...@@ -71,11 +68,14 @@ pub const available_libcs = [_]ArchOsAbi{
71 .{ .arch = .sparc64, .os = .linux, .abi = .gnu },68 .{ .arch = .sparc64, .os = .linux, .abi = .gnu },
72 .{ .arch = .wasm32, .os = .freestanding, .abi = .musl },69 .{ .arch = .wasm32, .os = .freestanding, .abi = .musl },
73 .{ .arch = .wasm32, .os = .wasi, .abi = .musl },70 .{ .arch = .wasm32, .os = .wasi, .abi = .musl },
71 .{ .arch = .x86, .os = .linux, .abi = .gnu },
72 .{ .arch = .x86, .os = .linux, .abi = .musl },
73 .{ .arch = .x86, .os = .windows, .abi = .gnu },
74 .{ .arch = .x86_64, .os = .linux, .abi = .gnu },74 .{ .arch = .x86_64, .os = .linux, .abi = .gnu },
75 .{ .arch = .x86_64, .os = .linux, .abi = .gnux32 },75 .{ .arch = .x86_64, .os = .linux, .abi = .gnux32 },
76 .{ .arch = .x86_64, .os = .linux, .abi = .musl },76 .{ .arch = .x86_64, .os = .linux, .abi = .musl },
77 .{ .arch = .x86_64, .os = .windows, .abi = .gnu },
78 .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 10, .minor = 7, .patch = 0 } },77 .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 10, .minor = 7, .patch = 0 } },
78 .{ .arch = .x86_64, .os = .windows, .abi = .gnu },
79};79};
8080
81pub fn canBuildLibC(target: std.Target) bool {81pub fn canBuildLibC(target: std.Target) bool {