authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-12-23 19:42:53+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-12-23 19:42:53+01:00
logf06ca14cb53d2b2f1956390813d35f82d0a36834
tree7cbb40d222d7f948c77f23252bd8fcf293ab5b87
parentd41052b6dcb227ac91efebfe7207490297e62ff6
parent130310972d41eed50d7f033bb2a71c3eb2467439
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #22225 from alexrp/libc-linux-os-version

Attach minimum Linux versions to provided libcs + incorporate ABI in `VersionRange.default()`

5 files changed, 154 insertions(+), 101 deletions(-)

lib/compiler/aro/aro/target.zig+4-4
......@@ -719,7 +719,7 @@ pub fn toLLVMTriple(target: std.Target, buf: []u8) []const u8 {
719719test "alignment functions - smoke test" {
720720 var target: std.Target = undefined;
721721 const x86 = std.Target.Cpu.Arch.x86_64;
722 target.os = std.Target.Os.Tag.defaultVersionRange(.linux, x86);
722 target.os = std.Target.Os.Tag.defaultVersionRange(.linux, x86, .none);
723723 target.cpu = std.Target.Cpu.baseline(x86, target.os);
724724 target.abi = std.Target.Abi.default(x86, target.os);
725725
......@@ -732,7 +732,7 @@ test "alignment functions - smoke test" {
732732 try std.testing.expect(systemCompiler(target) == .gcc);
733733
734734 const arm = std.Target.Cpu.Arch.arm;
735 target.os = std.Target.Os.Tag.defaultVersionRange(.ios, arm);
735 target.os = std.Target.Os.Tag.defaultVersionRange(.ios, arm, .none);
736736 target.cpu = std.Target.Cpu.baseline(arm, target.os);
737737 target.abi = std.Target.Abi.default(arm, target.os);
738738
......@@ -751,7 +751,7 @@ test "target size/align tests" {
751751 const x86 = std.Target.Cpu.Arch.x86;
752752 comp.target.cpu.arch = x86;
753753 comp.target.cpu.model = &std.Target.x86.cpu.i586;
754 comp.target.os = std.Target.Os.Tag.defaultVersionRange(.linux, x86);
754 comp.target.os = std.Target.Os.Tag.defaultVersionRange(.linux, x86, .none);
755755 comp.target.abi = std.Target.Abi.gnu;
756756
757757 const tt: Type = .{
......@@ -763,7 +763,7 @@ test "target size/align tests" {
763763
764764 const arm = std.Target.Cpu.Arch.arm;
765765 comp.target.cpu = std.Target.Cpu.Model.toCpu(&std.Target.arm.cpu.cortex_r4, arm);
766 comp.target.os = std.Target.Os.Tag.defaultVersionRange(.ios, arm);
766 comp.target.os = std.Target.Os.Tag.defaultVersionRange(.ios, arm, .none);
767767 comp.target.abi = std.Target.Abi.none;
768768
769769 const ct: Type = .{
lib/std/Target.zig+17-7
......@@ -148,10 +148,10 @@ pub const Os = struct {
148148 return (tag == .hurd or tag == .linux) and abi.isGnu();
149149 }
150150
151 pub fn defaultVersionRange(tag: Tag, arch: Cpu.Arch) Os {
151 pub fn defaultVersionRange(tag: Tag, arch: Cpu.Arch, abi: Abi) Os {
152152 return .{
153153 .tag = tag,
154 .version_range = VersionRange.default(tag, arch),
154 .version_range = .default(arch, tag, abi),
155155 };
156156 }
157157
......@@ -416,7 +416,7 @@ pub const Os = struct {
416416
417417 /// The default `VersionRange` represents the range that the Zig Standard Library
418418 /// bases its abstractions on.
419 pub fn default(tag: Tag, arch: Cpu.Arch) VersionRange {
419 pub fn default(arch: Cpu.Arch, tag: Tag, abi: Abi) VersionRange {
420420 return switch (tag) {
421421 .freestanding,
422422 .other,
......@@ -475,16 +475,26 @@ pub const Os = struct {
475475 .linux => .{
476476 .linux = .{
477477 .range = .{
478 .min = .{ .major = 4, .minor = 19, .patch = 0 },
478 .min = blk: {
479 const default_min: std.SemanticVersion = .{ .major = 4, .minor = 19, .patch = 0 };
480
481 for (std.zig.target.available_libcs) |libc| {
482 if (libc.arch != arch or libc.os != tag or libc.abi != abi) continue;
483
484 if (libc.os_ver) |min| {
485 if (min.order(default_min) == .gt) break :blk min;
486 }
487 }
488
489 break :blk default_min;
490 },
479491 .max = .{ .major = 6, .minor = 11, .patch = 5 },
480492 },
481493 .glibc = blk: {
482494 const default_min: std.SemanticVersion = .{ .major = 2, .minor = 28, .patch = 0 };
483495
484496 for (std.zig.target.available_libcs) |libc| {
485 // We don't know the ABI here. We can get away with not checking it
486 // for now, but that may not always remain true.
487 if (libc.os != tag or libc.arch != arch) continue;
497 if (libc.os != tag or libc.arch != arch or libc.abi != abi) continue;
488498
489499 if (libc.glibc_min) |min| {
490500 if (min.order(default_min) == .gt) break :blk min;
lib/std/zig/system.zig+47-14
......@@ -181,8 +181,12 @@ pub const DetectError = error{
181181/// components by detecting the native system, and then resolves
182182/// standard/default parts relative to that.
183183pub fn resolveTargetQuery(query: Target.Query) DetectError!Target {
184 // Until https://github.com/ziglang/zig/issues/4592 is implemented (support detecting the
185 // native CPU architecture as being different than the current target), we use this:
186 const query_cpu_arch = query.cpu_arch orelse builtin.cpu.arch;
184187 const query_os_tag = query.os_tag orelse builtin.os.tag;
185 var os = query_os_tag.defaultVersionRange(query.cpu_arch orelse builtin.cpu.arch);
188 const query_abi = query.abi orelse builtin.abi;
189 var os = query_os_tag.defaultVersionRange(query_cpu_arch, query_abi);
186190 if (query.os_tag == null) {
187191 switch (builtin.target.os.tag) {
188192 .linux => {
......@@ -338,29 +342,58 @@ pub fn resolveTargetQuery(query: Target.Query) DetectError!Target {
338342 os.version_range.linux.android = android;
339343 }
340344
341 // Until https://github.com/ziglang/zig/issues/4592 is implemented (support detecting the
342 // native CPU architecture as being different than the current target), we use this:
343 const cpu_arch = query.cpu_arch orelse builtin.cpu.arch;
344
345345 const cpu = switch (query.cpu_model) {
346 .native => detectNativeCpuAndFeatures(cpu_arch, os, query),
347 .baseline => Target.Cpu.baseline(cpu_arch, os),
346 .native => detectNativeCpuAndFeatures(query_cpu_arch, os, query),
347 .baseline => Target.Cpu.baseline(query_cpu_arch, os),
348348 .determined_by_arch_os => if (query.cpu_arch == null)
349 detectNativeCpuAndFeatures(cpu_arch, os, query)
349 detectNativeCpuAndFeatures(query_cpu_arch, os, query)
350350 else
351 Target.Cpu.baseline(cpu_arch, os),
352 .explicit => |model| model.toCpu(cpu_arch),
351 Target.Cpu.baseline(query_cpu_arch, os),
352 .explicit => |model| model.toCpu(query_cpu_arch),
353353 } orelse backup_cpu_detection: {
354 break :backup_cpu_detection Target.Cpu.baseline(cpu_arch, os);
354 break :backup_cpu_detection Target.Cpu.baseline(query_cpu_arch, os);
355355 };
356
356357 var result = try detectAbiAndDynamicLinker(cpu, os, query);
358
359 // It's possible that we detect the native ABI, but fail to detect the OS version or were told
360 // to use the default OS version range. In that case, while we can't determine the exact native
361 // OS version, we do at least know that some ABIs require a particular OS version (by way of
362 // `std.zig.target.available_libcs`). So in this case, adjust the OS version to the minimum that
363 // we know is required.
364 if (result.abi != query_abi and query.os_version_min == null) {
365 const result_ver_range = &result.os.version_range;
366 const abi_ver_range = result.os.tag.defaultVersionRange(result.cpu.arch, result.abi).version_range;
367
368 switch (result.os.tag.versionRangeTag()) {
369 .none => {},
370 .semver => if (result_ver_range.semver.min.order(abi_ver_range.semver.min) == .lt) {
371 result_ver_range.semver.min = abi_ver_range.semver.min;
372 },
373 inline .hurd, .linux => |t| {
374 if (@field(result_ver_range, @tagName(t)).range.min.order(@field(abi_ver_range, @tagName(t)).range.min) == .lt) {
375 @field(result_ver_range, @tagName(t)).range.min = @field(abi_ver_range, @tagName(t)).range.min;
376 }
377
378 if (@field(result_ver_range, @tagName(t)).glibc.order(@field(abi_ver_range, @tagName(t)).glibc) == .lt and
379 query.glibc_version == null)
380 {
381 @field(result_ver_range, @tagName(t)).glibc = @field(abi_ver_range, @tagName(t)).glibc;
382 }
383 },
384 .windows => if (!result_ver_range.windows.min.isAtLeast(abi_ver_range.windows.min)) {
385 result_ver_range.windows.min = abi_ver_range.windows.min;
386 },
387 }
388 }
389
357390 // For x86, we need to populate some CPU feature flags depending on architecture
358391 // and mode:
359392 // * 16bit_mode => if the abi is code16
360393 // * 32bit_mode => if the arch is x86
361394 // However, the "mode" flags can be used as overrides, so if the user explicitly
362395 // sets one of them, that takes precedence.
363 switch (cpu_arch) {
396 switch (result.cpu.arch) {
364397 .x86 => {
365398 if (!Target.x86.featureSetHasAny(query.cpu_features_add, .{
366399 .@"16bit_mode", .@"32bit_mode",
......@@ -388,12 +421,12 @@ pub fn resolveTargetQuery(query: Target.Query) DetectError!Target {
388421 }
389422 updateCpuFeatures(
390423 &result.cpu.features,
391 cpu_arch.allFeaturesList(),
424 result.cpu.arch.allFeaturesList(),
392425 query.cpu_features_add,
393426 query.cpu_features_sub,
394427 );
395428
396 if (cpu_arch == .hexagon) {
429 if (result.cpu.arch == .hexagon) {
397430 // Both LLVM and LLD have broken support for the small data area. Yet LLVM has the feature
398431 // on by default for all Hexagon CPUs. Clang sort of solves this by defaulting the `-gpsize`
399432 // command line parameter for the Hexagon backend to 0, so that no constants get placed in
lib/std/zig/target.zig+72-69
......@@ -4,80 +4,81 @@ pub const ArchOsAbi = struct {
44 abi: std.Target.Abi,
55 os_ver: ?std.SemanticVersion = null,
66
7 /// Minimum glibc version that provides support for the arch/os when ABI is GNU.
7 /// Minimum glibc version that provides support for the arch/OS when ABI is GNU. Note that Zig
8 /// can only target glibc 2.2.5+, so `null` means the minimum is older than that.
89 glibc_min: ?std.SemanticVersion = null,
910 /// Override for `glibcRuntimeTriple` when glibc has an unusual directory name for the target.
1011 glibc_triple: ?[]const u8 = null,
1112};
1213
1314pub const available_libcs = [_]ArchOsAbi{
14 .{ .arch = .arc, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 32, .patch = 0 } },
15 .{ .arch = .arm, .os = .linux, .abi = .gnueabi },
16 .{ .arch = .arm, .os = .linux, .abi = .gnueabihf },
17 .{ .arch = .arm, .os = .linux, .abi = .musleabi },
18 .{ .arch = .arm, .os = .linux, .abi = .musleabihf },
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 = .thumb, .os = .linux, .abi = .musleabi },
24 .{ .arch = .thumb, .os = .linux, .abi = .musleabihf },
15 .{ .arch = .arc, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 4, .minor = 2, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 32, .patch = 0 } },
16 .{ .arch = .arm, .os = .linux, .abi = .gnueabi, .os_ver = .{ .major = 2, .minor = 1, .patch = 0 } },
17 .{ .arch = .arm, .os = .linux, .abi = .gnueabihf, .os_ver = .{ .major = 2, .minor = 1, .patch = 0 } },
18 .{ .arch = .arm, .os = .linux, .abi = .musleabi, .os_ver = .{ .major = 2, .minor = 1, .patch = 0 } },
19 .{ .arch = .arm, .os = .linux, .abi = .musleabihf, .os_ver = .{ .major = 2, .minor = 1, .patch = 0 } },
20 .{ .arch = .armeb, .os = .linux, .abi = .gnueabi, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } },
21 .{ .arch = .armeb, .os = .linux, .abi = .gnueabihf, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } },
22 .{ .arch = .armeb, .os = .linux, .abi = .musleabi, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } },
23 .{ .arch = .armeb, .os = .linux, .abi = .musleabihf, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } },
24 .{ .arch = .thumb, .os = .linux, .abi = .musleabi, .os_ver = .{ .major = 2, .minor = 1, .patch = 0 } },
25 .{ .arch = .thumb, .os = .linux, .abi = .musleabihf, .os_ver = .{ .major = 2, .minor = 1, .patch = 0 } },
2526 .{ .arch = .thumb, .os = .windows, .abi = .gnu },
26 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabi },
27 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabihf },
28 .{ .arch = .aarch64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 17, .patch = 0 } },
29 .{ .arch = .aarch64, .os = .linux, .abi = .musl },
27 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabi, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } },
28 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabihf, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } },
29 .{ .arch = .aarch64, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 3, .minor = 7, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 17, .patch = 0 } },
30 .{ .arch = .aarch64, .os = .linux, .abi = .musl, .os_ver = .{ .major = 3, .minor = 7, .patch = 0 } },
3031 .{ .arch = .aarch64, .os = .macos, .abi = .none, .os_ver = .{ .major = 11, .minor = 0, .patch = 0 } },
3132 .{ .arch = .aarch64, .os = .windows, .abi = .gnu },
32 .{ .arch = .aarch64_be, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 17, .patch = 0 } },
33 .{ .arch = .aarch64_be, .os = .linux, .abi = .musl },
34 .{ .arch = .csky, .os = .linux, .abi = .gnueabi, .glibc_min = .{ .major = 2, .minor = 29, .patch = 0 }, .glibc_triple = "csky-linux-gnuabiv2-soft" },
35 .{ .arch = .csky, .os = .linux, .abi = .gnueabihf, .glibc_min = .{ .major = 2, .minor = 29, .patch = 0 }, .glibc_triple = "csky-linux-gnuabiv2" },
36 .{ .arch = .loongarch64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 36, .patch = 0 }, .glibc_triple = "loongarch64-linux-gnu-lp64d" },
37 .{ .arch = .loongarch64, .os = .linux, .abi = .gnusf, .glibc_min = .{ .major = 2, .minor = 36, .patch = 0 }, .glibc_triple = "loongarch64-linux-gnu-lp64s" },
38 .{ .arch = .loongarch64, .os = .linux, .abi = .musl },
39 .{ .arch = .m68k, .os = .linux, .abi = .gnu },
40 .{ .arch = .m68k, .os = .linux, .abi = .musl },
41 .{ .arch = .mips, .os = .linux, .abi = .gnueabi, .glibc_triple = "mips-linux-gnu-soft" },
42 .{ .arch = .mips, .os = .linux, .abi = .gnueabihf, .glibc_triple = "mips-linux-gnu" },
43 .{ .arch = .mips, .os = .linux, .abi = .musleabi },
44 .{ .arch = .mips, .os = .linux, .abi = .musleabihf },
45 .{ .arch = .mipsel, .os = .linux, .abi = .gnueabi, .glibc_triple = "mipsel-linux-gnu-soft" },
46 .{ .arch = .mipsel, .os = .linux, .abi = .gnueabihf, .glibc_triple = "mipsel-linux-gnu" },
47 .{ .arch = .mipsel, .os = .linux, .abi = .musleabi },
48 .{ .arch = .mipsel, .os = .linux, .abi = .musleabihf },
49 .{ .arch = .mips64, .os = .linux, .abi = .gnuabi64, .glibc_triple = "mips64-linux-gnu-n64" },
50 .{ .arch = .mips64, .os = .linux, .abi = .gnuabin32, .glibc_triple = "mips64-linux-gnu-n32" },
51 .{ .arch = .mips64, .os = .linux, .abi = .muslabi64 },
52 .{ .arch = .mips64, .os = .linux, .abi = .muslabin32 },
53 .{ .arch = .mips64el, .os = .linux, .abi = .gnuabi64, .glibc_triple = "mips64el-linux-gnu-n64" },
54 .{ .arch = .mips64el, .os = .linux, .abi = .gnuabin32, .glibc_triple = "mips64el-linux-gnu-n32" },
55 .{ .arch = .mips64el, .os = .linux, .abi = .muslabi64 },
56 .{ .arch = .mips64el, .os = .linux, .abi = .muslabin32 },
57 .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi, .glibc_triple = "powerpc-linux-gnu-soft" },
58 .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf, .glibc_triple = "powerpc-linux-gnu" },
59 .{ .arch = .powerpc, .os = .linux, .abi = .musleabi },
60 .{ .arch = .powerpc, .os = .linux, .abi = .musleabihf },
61 .{ .arch = .powerpc64, .os = .linux, .abi = .gnu },
62 .{ .arch = .powerpc64, .os = .linux, .abi = .musl },
63 .{ .arch = .powerpc64le, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 19, .patch = 0 } },
64 .{ .arch = .powerpc64le, .os = .linux, .abi = .musl },
65 .{ .arch = .riscv32, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 33, .patch = 0 }, .glibc_triple = "riscv32-linux-gnu-rv32imafdc-ilp32d" },
66 .{ .arch = .riscv32, .os = .linux, .abi = .musl },
67 .{ .arch = .riscv64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 27, .patch = 0 }, .glibc_triple = "riscv64-linux-gnu-rv64imafdc-lp64d" },
68 .{ .arch = .riscv64, .os = .linux, .abi = .musl },
69 .{ .arch = .s390x, .os = .linux, .abi = .gnu },
70 .{ .arch = .s390x, .os = .linux, .abi = .musl },
71 .{ .arch = .sparc, .os = .linux, .abi = .gnu, .glibc_triple = "sparcv9-linux-gnu" },
72 .{ .arch = .sparc64, .os = .linux, .abi = .gnu },
33 .{ .arch = .aarch64_be, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 3, .minor = 13, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 17, .patch = 0 } },
34 .{ .arch = .aarch64_be, .os = .linux, .abi = .musl, .os_ver = .{ .major = 3, .minor = 13, .patch = 0 } },
35 .{ .arch = .csky, .os = .linux, .abi = .gnueabi, .os_ver = .{ .major = 4, .minor = 20, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 29, .patch = 0 }, .glibc_triple = "csky-linux-gnuabiv2-soft" },
36 .{ .arch = .csky, .os = .linux, .abi = .gnueabihf, .os_ver = .{ .major = 4, .minor = 20, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 29, .patch = 0 }, .glibc_triple = "csky-linux-gnuabiv2" },
37 .{ .arch = .loongarch64, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 5, .minor = 19, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 36, .patch = 0 }, .glibc_triple = "loongarch64-linux-gnu-lp64d" },
38 .{ .arch = .loongarch64, .os = .linux, .abi = .gnusf, .os_ver = .{ .major = 5, .minor = 19, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 36, .patch = 0 }, .glibc_triple = "loongarch64-linux-gnu-lp64s" },
39 .{ .arch = .loongarch64, .os = .linux, .abi = .musl, .os_ver = .{ .major = 5, .minor = 19, .patch = 0 } },
40 .{ .arch = .m68k, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 1, .minor = 3, .patch = 94 } },
41 .{ .arch = .m68k, .os = .linux, .abi = .musl, .os_ver = .{ .major = 1, .minor = 3, .patch = 94 } },
42 .{ .arch = .mips, .os = .linux, .abi = .gnueabi, .os_ver = .{ .major = 1, .minor = 1, .patch = 82 }, .glibc_triple = "mips-linux-gnu-soft" },
43 .{ .arch = .mips, .os = .linux, .abi = .gnueabihf, .os_ver = .{ .major = 1, .minor = 1, .patch = 82 }, .glibc_triple = "mips-linux-gnu" },
44 .{ .arch = .mips, .os = .linux, .abi = .musleabi, .os_ver = .{ .major = 1, .minor = 1, .patch = 82 } },
45 .{ .arch = .mips, .os = .linux, .abi = .musleabihf, .os_ver = .{ .major = 1, .minor = 1, .patch = 82 } },
46 .{ .arch = .mipsel, .os = .linux, .abi = .gnueabi, .os_ver = .{ .major = 1, .minor = 1, .patch = 82 }, .glibc_triple = "mipsel-linux-gnu-soft" },
47 .{ .arch = .mipsel, .os = .linux, .abi = .gnueabihf, .os_ver = .{ .major = 1, .minor = 1, .patch = 82 }, .glibc_triple = "mipsel-linux-gnu" },
48 .{ .arch = .mipsel, .os = .linux, .abi = .musleabi, .os_ver = .{ .major = 1, .minor = 1, .patch = 82 } },
49 .{ .arch = .mipsel, .os = .linux, .abi = .musleabihf, .os_ver = .{ .major = 1, .minor = 1, .patch = 82 } },
50 .{ .arch = .mips64, .os = .linux, .abi = .gnuabi64, .os_ver = .{ .major = 2, .minor = 3, .patch = 48 }, .glibc_triple = "mips64-linux-gnu-n64" },
51 .{ .arch = .mips64, .os = .linux, .abi = .gnuabin32, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 }, .glibc_triple = "mips64-linux-gnu-n32" },
52 .{ .arch = .mips64, .os = .linux, .abi = .muslabi64, .os_ver = .{ .major = 2, .minor = 3, .patch = 48 } },
53 .{ .arch = .mips64, .os = .linux, .abi = .muslabin32, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } },
54 .{ .arch = .mips64el, .os = .linux, .abi = .gnuabi64, .os_ver = .{ .major = 2, .minor = 3, .patch = 48 }, .glibc_triple = "mips64el-linux-gnu-n64" },
55 .{ .arch = .mips64el, .os = .linux, .abi = .gnuabin32, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 }, .glibc_triple = "mips64el-linux-gnu-n32" },
56 .{ .arch = .mips64el, .os = .linux, .abi = .muslabi64, .os_ver = .{ .major = 2, .minor = 3, .patch = 48 } },
57 .{ .arch = .mips64el, .os = .linux, .abi = .muslabin32, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } },
58 .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 }, .glibc_triple = "powerpc-linux-gnu-soft" },
59 .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 }, .glibc_triple = "powerpc-linux-gnu" },
60 .{ .arch = .powerpc, .os = .linux, .abi = .musleabi, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 } },
61 .{ .arch = .powerpc, .os = .linux, .abi = .musleabihf, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 } },
62 .{ .arch = .powerpc64, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } },
63 .{ .arch = .powerpc64, .os = .linux, .abi = .musl, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } },
64 .{ .arch = .powerpc64le, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 3, .minor = 14, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 19, .patch = 0 } },
65 .{ .arch = .powerpc64le, .os = .linux, .abi = .musl, .os_ver = .{ .major = 3, .minor = 14, .patch = 0 } },
66 .{ .arch = .riscv32, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 4, .minor = 15, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 33, .patch = 0 }, .glibc_triple = "riscv32-linux-gnu-rv32imafdc-ilp32d" },
67 .{ .arch = .riscv32, .os = .linux, .abi = .musl, .os_ver = .{ .major = 4, .minor = 15, .patch = 0 } },
68 .{ .arch = .riscv64, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 4, .minor = 15, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 27, .patch = 0 }, .glibc_triple = "riscv64-linux-gnu-rv64imafdc-lp64d" },
69 .{ .arch = .riscv64, .os = .linux, .abi = .musl, .os_ver = .{ .major = 4, .minor = 15, .patch = 0 } },
70 .{ .arch = .s390x, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 2, .minor = 4, .patch = 2 } },
71 .{ .arch = .s390x, .os = .linux, .abi = .musl, .os_ver = .{ .major = 2, .minor = 4, .patch = 2 } },
72 .{ .arch = .sparc, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 2, .minor = 1, .patch = 19 }, .glibc_triple = "sparcv9-linux-gnu" },
73 .{ .arch = .sparc64, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 2, .minor = 1, .patch = 19 } },
7374 .{ .arch = .wasm32, .os = .wasi, .abi = .musl },
7475 .{ .arch = .x86, .os = .linux, .abi = .gnu },
7576 .{ .arch = .x86, .os = .linux, .abi = .musl },
7677 .{ .arch = .x86, .os = .windows, .abi = .gnu },
77 .{ .arch = .x86_64, .os = .linux, .abi = .gnu },
78 .{ .arch = .x86_64, .os = .linux, .abi = .gnux32, .glibc_triple = "x86_64-linux-gnu-x32" },
79 .{ .arch = .x86_64, .os = .linux, .abi = .musl },
80 .{ .arch = .x86_64, .os = .linux, .abi = .muslx32 },
78 .{ .arch = .x86_64, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 2, .minor = 6, .patch = 4 } },
79 .{ .arch = .x86_64, .os = .linux, .abi = .gnux32, .os_ver = .{ .major = 3, .minor = 4, .patch = 0 }, .glibc_triple = "x86_64-linux-gnu-x32" },
80 .{ .arch = .x86_64, .os = .linux, .abi = .musl, .os_ver = .{ .major = 2, .minor = 6, .patch = 4 } },
81 .{ .arch = .x86_64, .os = .linux, .abi = .muslx32, .os_ver = .{ .major = 3, .minor = 4, .patch = 0 } },
8182 .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 10, .minor = 7, .patch = 0 } },
8283 .{ .arch = .x86_64, .os = .windows, .abi = .gnu },
8384};
......@@ -85,15 +86,17 @@ pub const available_libcs = [_]ArchOsAbi{
8586pub fn canBuildLibC(target: std.Target) bool {
8687 for (available_libcs) |libc| {
8788 if (target.cpu.arch == libc.arch and target.os.tag == libc.os and target.abi == libc.abi) {
88 if (target.os.tag == .macos) {
89 const ver = target.os.version_range.semver;
90 return ver.min.order(libc.os_ver.?) != .lt;
89 if (libc.os_ver) |libc_os_ver| {
90 if (switch (target.os.versionRange()) {
91 .semver => |v| v,
92 .linux => |v| v.range,
93 else => null,
94 }) |ver| {
95 if (ver.min.order(libc_os_ver) == .lt) return false;
96 }
9197 }
92 // Ensure glibc (aka *-(linux,hurd)-gnu) version is supported
93 if (target.isGnuLibC()) {
94 const min_glibc_ver = libc.glibc_min orelse return true;
95 const target_glibc_ver = target.os.versionRange().gnuLibCVersion().?;
96 return target_glibc_ver.order(min_glibc_ver) != .lt;
98 if (libc.glibc_min) |glibc_min| {
99 if (target.os.versionRange().gnuLibCVersion().?.order(glibc_min) == .lt) return false;
97100 }
98101 return true;
99102 }
src/main.zig+14-7
......@@ -3549,21 +3549,28 @@ fn buildOutputType(
35493549
35503550 for (std.zig.target.available_libcs) |t| {
35513551 if (t.arch == target.cpu.arch and t.os == target.os.tag) {
3552 if (t.os_ver) |os_ver| {
3553 std.log.info("zig can provide libc for related target {s}-{s}.{d}-{s}", .{
3554 @tagName(t.arch), @tagName(t.os), os_ver.major, @tagName(t.abi),
3555 });
3556 } else if (t.glibc_min) |glibc_min| {
3557 std.log.info("zig can provide libc for related target {s}-{s}-{s}.{d}.{d}", .{
3552 // If there's a `glibc_min`, there's also an `os_ver`.
3553 if (t.glibc_min) |glibc_min| {
3554 std.log.info("zig can provide libc for related target {s}-{s}.{}-{s}.{d}.{d}", .{
35583555 @tagName(t.arch),
35593556 @tagName(t.os),
3557 t.os_ver.?,
35603558 @tagName(t.abi),
35613559 glibc_min.major,
35623560 glibc_min.minor,
35633561 });
3562 } else if (t.os_ver) |os_ver| {
3563 std.log.info("zig can provide libc for related target {s}-{s}.{}-{s}", .{
3564 @tagName(t.arch),
3565 @tagName(t.os),
3566 os_ver,
3567 @tagName(t.abi),
3568 });
35643569 } else {
35653570 std.log.info("zig can provide libc for related target {s}-{s}-{s}", .{
3566 @tagName(t.arch), @tagName(t.os), @tagName(t.abi),
3571 @tagName(t.arch),
3572 @tagName(t.os),
3573 @tagName(t.abi),
35673574 });
35683575 }
35693576 }