From 63f2e96eeaaa032ffa9ff11a4a632d8032883233 Mon Sep 17 00:00:00 2001 From: Shritesh Bhattarai Date: Fri, 12 Apr 2019 10:54:15 -0500 Subject: [PATCH] wasm: use .wasm ext for exe --- src/codegen.cpp | 3 +-- src/target.cpp | 6 ++++++ src/target.hpp | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/codegen.cpp b/src/codegen.cpp index 7e85fa238a..7d280b7ad1 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -7953,8 +7953,7 @@ static void init(CodeGen *g) { } } - bool is_wasm = g->zig_target->arch == ZigLLVM_wasm32 || g->zig_target->arch == ZigLLVM_wasm64; - g->have_err_ret_tracing = !is_wasm && g->build_mode != BuildModeFastRelease && g->build_mode != BuildModeSmallRelease; + g->have_err_ret_tracing = !target_is_wasm(g->zig_target) && g->build_mode != BuildModeFastRelease && g->build_mode != BuildModeSmallRelease; define_builtin_fns(g); Error err; diff --git a/src/target.cpp b/src/target.cpp index 3b4265359c..7d66761a16 100644 --- a/src/target.cpp +++ b/src/target.cpp @@ -965,6 +965,8 @@ const char *target_exe_file_ext(const ZigTarget *target) { return ".exe"; } else if (target->os == OsUefi) { return ".efi"; + } else if (target_is_wasm(target)) { + return ".wasm"; } else { return ""; } @@ -1365,6 +1367,10 @@ bool target_is_musl(const ZigTarget *target) { return target->os == OsLinux && target_abi_is_musl(target->abi); } +bool target_is_wasm(const ZigTarget *target) { + return target->arch == ZigLLVM_wasm32 || target->arch == ZigLLVM_wasm64; +} + ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) { switch (os) { case OsFreestanding: diff --git a/src/target.hpp b/src/target.hpp index 4a0264c2b1..0e3180bb2c 100644 --- a/src/target.hpp +++ b/src/target.hpp @@ -170,6 +170,7 @@ bool target_abi_is_gnu(ZigLLVM_EnvironmentType abi); bool target_abi_is_musl(ZigLLVM_EnvironmentType abi); bool target_is_glibc(const ZigTarget *target); bool target_is_musl(const ZigTarget *target); +bool target_is_wasm(const ZigTarget *target); uint32_t target_arch_pointer_bit_width(ZigLLVM_ArchType arch);