Merge branch 'master' into llvm6

2017-12-04 15:28:17 -05:00
parent afe3aae582 a966275e50
commit 42004f9013
57 changed files with 2603 additions and 1581 deletions
--- a/src/zig_llvm.cpp
+++ b/src/zig_llvm.cpp
@@ -793,7 +793,7 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_
            zig_unreachable();

        case ZigLLVM_COFF:
-            return lld::coff::link(array_ref_args, false);
+            return lld::coff::link(array_ref_args, false, diag);

        case ZigLLVM_ELF:
            return lld::elf::link(array_ref_args, false, diag);