Merge remote-tracking branch 'origin/master' into llvm7

2018-06-14 18:27:59 -04:00
parent ef7f69d14a f0697c28f8
commit 32dd98b19f
93 changed files with 5388 additions and 2155 deletions
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -596,12 +596,15 @@ void resolve_target_object_format(ZigTarget *target) {
        case ZigLLVM_tce:
        case ZigLLVM_tcele:
        case ZigLLVM_thumbeb:
-        case ZigLLVM_wasm32:
-        case ZigLLVM_wasm64:
        case ZigLLVM_xcore:
            target->oformat= ZigLLVM_ELF;
            return;

+        case ZigLLVM_wasm32:
+        case ZigLLVM_wasm64:
+            target->oformat = ZigLLVM_Wasm;
+            return;
+
        case ZigLLVM_ppc:
        case ZigLLVM_ppc64:
            if (is_os_darwin(target)) {