diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 4 | ||||
| -rw-r--r-- | src/target.cpp | 25 | ||||
| -rw-r--r-- | src/target.hpp | 2 |
3 files changed, 28 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 2dc500b1bb..ca5e99ed3f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -711,9 +711,7 @@ int main(int argc, char **argv) { codegen_build(g); codegen_link(g, buf_ptr(test_exe_name)); - bool is_native_target = target == nullptr || (target->os == native.os && - target->arch.arch == native.arch.arch && target->arch.sub_arch == native.arch.sub_arch); - if (!is_native_target) { + if (!target_can_exec(&native, target)) { fprintf(stderr, "Created %s but skipping execution because it is non-native.\n", buf_ptr(test_exe_name)); return 0; diff --git a/src/target.cpp b/src/target.cpp index 8a58a42b59..68969b3821 100644 --- a/src/target.cpp +++ b/src/target.cpp @@ -640,3 +640,28 @@ Buf *target_dynamic_linker(ZigTarget *target) { return buf_create_from_str("/lib64/ld-linux-x86-64.so.2"); } } + +bool target_can_exec(const ZigTarget *host_target, const ZigTarget *guest_target) { + assert(host_target != nullptr); + + if (guest_target == nullptr) { + // null guest target means that the guest target is native + return true; + } + + if (guest_target->os == host_target->os && guest_target->arch.arch == host_target->arch.arch && + guest_target->arch.sub_arch == host_target->arch.sub_arch) + { + // OS, arch, and sub-arch match + return true; + } + + if (guest_target->os == ZigLLVM_Win32 && guest_target->os == ZigLLVM_Win32 && + host_target->arch.arch == ZigLLVM_x86_64 && guest_target->arch.arch == ZigLLVM_x86) + { + // 64-bit windows can run 32-bit programs + return true; + } + + return false; +} diff --git a/src/target.hpp b/src/target.hpp index dbacd6a2c7..528e42d687 100644 --- a/src/target.hpp +++ b/src/target.hpp @@ -77,5 +77,7 @@ const char *target_exe_file_ext(ZigTarget *target); Buf *target_dynamic_linker(ZigTarget *target); +bool target_can_exec(const ZigTarget *host_target, const ZigTarget *guest_target); + #endif |