authorgravatar for mixerator@rambler.ruDes-Nerger <mixerator@rambler.ru> 2025-01-02 18:57:19+10:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-01-07 19:03:40+01:00
log6a21d18adfe9ae4ff7f4beacbd4faed4d04832b8
tree93e409b25eaea920cf8063ea9ffb2af48b30f365
parent40f5eac79c8491e2e9ac0861e18872d6ba5b3b0b

`-fwine`: allow 32-bit .exe's be run on backward-compatible 64-bit arches

Closes #22361.

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

lib/std/zig/system.zig+4-1
......@@ -130,7 +130,10 @@ pub fn getExternalExecutor(
130130 if (options.allow_wine) {
131131 // x86_64 wine does not support emulating aarch64-windows and
132132 // vice versa.
133 if (candidate.cpu.arch != builtin.cpu.arch) {
133 if (candidate.cpu.arch != builtin.cpu.arch and
134 !(candidate.cpu.arch == .thumb and builtin.cpu.arch == .aarch64) and
135 !(candidate.cpu.arch == .x86 and builtin.cpu.arch == .x86_64))
136 {
134137 return bad_result;
135138 }
136139 switch (candidate.ptrBitWidth()) {