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

…ches Closes #22361.
ziglang · Jan 7, 2025 · 6a21d18 · 6a21d18
1 parent 40f5eac
commit 6a21d18
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/std/zig/system.zig b/lib/std/zig/system.zig
@@ -130,7 +130,10 @@ pub fn getExternalExecutor(
             if (options.allow_wine) {
                 // x86_64 wine does not support emulating aarch64-windows and
                 // vice versa.
-                if (candidate.cpu.arch != builtin.cpu.arch) {
+                if (candidate.cpu.arch != builtin.cpu.arch and
+                    !(candidate.cpu.arch == .thumb and builtin.cpu.arch == .aarch64) and
+                    !(candidate.cpu.arch == .x86 and builtin.cpu.arch == .x86_64))
+                {
                     return bad_result;
                 }
                 switch (candidate.ptrBitWidth()) {