Commit 7c87691a61f54901cea27a14e655407332d69e3e | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2025-10-06 06:11:06+02:00
committer	GitHub <noreply@github.com> 2025-10-06 06:11:06+02:00
log	7c87691a61f54901cea27a14e655407332d69e3e
tree	3c45ba957fd0a869cea07e0fd4602c40837c677e
parent	ddc815e3d88d32b8f3df0610ee59c8d34b8ff8eb
parent	9e61a64033c4a8e085629fbf81c9238d51f17cc8
signature	Signed by PGP key B5690EEEBB952194

Merge pull request #25479 from alexrp/qemu-os-checks

`std.zig.system`: add OS checks for QEMU in `getExternalExecutor()`

1 files changed, 57 insertions(+), 42 deletions(-)

lib
- std
  - zig
    system.zig

lib/std/zig/system.zig+57-42

...	...	@@ -81,52 +81,67 @@ pub fn getExternalExecutor(
81	81	// If the OS matches, we can use QEMU to emulate a foreign architecture.
82	82	if (options.allow_qemu and os_match and (!cpu_ok or options.qemu_fixes_dl)) {
83	83	return switch (candidate.cpu.arch) {
84		.aarch64 => Executor{ .qemu = "qemu-aarch64" },
85		.aarch64_be => Executor{ .qemu = "qemu-aarch64_be" },
86		.arm, .thumb => Executor{ .qemu = "qemu-arm" },
87		.armeb, .thumbeb => Executor{ .qemu = "qemu-armeb" },
88		.hexagon => Executor{ .qemu = "qemu-hexagon" },
89		.loongarch64 => Executor{ .qemu = "qemu-loongarch64" },
90		.m68k => Executor{ .qemu = "qemu-m68k" },
91		.mips => Executor{ .qemu = "qemu-mips" },
92		.mipsel => Executor{ .qemu = "qemu-mipsel" },
93		.mips64 => Executor{
94		.qemu = switch (candidate.abi) {
95		.gnuabin32, .muslabin32 => "qemu-mipsn32",
96		else => "qemu-mips64",
97		},
98		},
99		.mips64el => Executor{
100		.qemu = switch (candidate.abi) {
101		.gnuabin32, .muslabin32 => "qemu-mipsn32el",
102		else => "qemu-mips64el",
103		},
104		},
105		.powerpc => Executor{ .qemu = "qemu-ppc" },
106		.powerpc64 => Executor{ .qemu = "qemu-ppc64" },
107		.powerpc64le => Executor{ .qemu = "qemu-ppc64le" },
108		.riscv32 => Executor{ .qemu = "qemu-riscv32" },
109		.riscv64 => Executor{ .qemu = "qemu-riscv64" },
110		.s390x => Executor{ .qemu = "qemu-s390x" },
111		.sparc => Executor{
112		.qemu = if (candidate.cpu.has(.sparc, .v8plus))
113		"qemu-sparc32plus"
114		else
115		"qemu-sparc",
	84	inline .aarch64,
	85	.arm,
	86	.riscv64,
	87	.x86,
	88	.x86_64,
	89	=> \|t\| switch (candidate.os.tag) {
	90	.linux,
	91	.freebsd,
	92	=> .{ .qemu = switch (t) {
	93	.x86 => "qemu-i386",
	94	.x86_64 => switch (candidate.abi) {
	95	.gnux32, .muslx32 => return bad_result,
	96	else => "qemu-x86_64",
	97	},
	98	else => "qemu-" ++ @tagName(t),
	99	} },
	100	else => bad_result,
116	101	},
117		.sparc64 => Executor{ .qemu = "qemu-sparc64" },
118		.x86 => Executor{ .qemu = "qemu-i386" },
119		.x86_64 => switch (candidate.abi) {
120		.gnux32, .muslx32 => return bad_result,
121		else => Executor{ .qemu = "qemu-x86_64" },
	102	inline .aarch64_be,
	103	.armeb,
	104	.hexagon,
	105	.loongarch64,
	106	.m68k,
	107	.mips,
	108	.mipsel,
	109	.mips64,
	110	.mips64el,
	111	.or1k,
	112	.powerpc,
	113	.powerpc64,
	114	.powerpc64le,
	115	.riscv32,
	116	.s390x,
	117	.sparc,
	118	.sparc64,
	119	.thumb,
	120	.thumbeb,
	121	.xtensa,
	122	=> \|t\| switch (candidate.os.tag) {
	123	.linux,
	124	=> .{ .qemu = switch (t) {
	125	.powerpc => "qemu-ppc",
	126	.powerpc64 => "qemu-ppc64",
	127	.powerpc64le => "qemu-ppc64le",
	128	.mips64, .mips64el => switch (candidate.abi) {
	129	.gnuabin32, .muslabin32 => if (t == .mips64el) "qemu-mipsn32el" else "qemu-mipsn32",
	130	else => "qemu-" ++ @tagName(t),
	131	},
	132	.sparc => if (candidate.cpu.has(.sparc, .v8plus)) "qemu-sparc32plus" else "qemu-sparc",
	133	.thumb => "qemu-arm",
	134	.thumbeb => "qemu-armeb",
	135	else => "qemu-" ++ @tagName(t),
	136	} },
	137	else => bad_result,
122	138	},
123		.xtensa => Executor{ .qemu = "qemu-xtensa" },
124		else => return bad_result,
	139	else => bad_result,
125	140	};
126	141	}
127	142
128	143	if (options.allow_wasmtime and candidate.cpu.arch.isWasm()) {
129		return Executor{ .wasmtime = "wasmtime" };
	144	return .{ .wasmtime = "wasmtime" };
130	145	}
131	146
132	147	switch (candidate.os.tag) {
...	...	@@ -142,7 +157,7 @@ pub fn getExternalExecutor(
142	157	.x86_64 => host.cpu.arch == .x86_64,
143	158	else => false,
144	159	};
145		return if (wine_supported) Executor{ .wine = "wine" } else bad_result;
	160	return if (wine_supported) .{ .wine = "wine" } else bad_result;
146	161	}
147	162	return bad_result;
148	163	},
...	...	@@ -154,7 +169,7 @@ pub fn getExternalExecutor(
154	169	if (candidate.cpu.arch != host.cpu.arch) {
155	170	return bad_result;
156	171	}
157		return Executor{ .darling = "darling" };
	172	return .{ .darling = "darling" };
158	173	}
159	174	return bad_result;
160	175	},