authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-01 13:44:28-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-01 13:44:28-05:00
logcf96b6f87b5feaa699f0d15b1525d53a374b6227
tree6d2c75762c3e08dd686710666f8208fa1406be6c
parentbdd5241615bf41b69d3e12f3b6796bd796fb90f2

update to LLVM 5.0.1rc2

2 files changed, 9 insertions(+), 4 deletions(-)

CMakeLists.txt+8-3
...@@ -47,15 +47,20 @@ option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)...@@ -47,15 +47,20 @@ option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)
47option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead of the embedded LLD" OFF)47option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead of the embedded LLD" OFF)
4848
49find_package(llvm)49find_package(llvm)
50include_directories(${LLVM_INCLUDE_DIRS})
51
52find_package(clang)50find_package(clang)
53include_directories(${CLANG_INCLUDE_DIRS})
5451
55if(ZIG_FORCE_EXTERNAL_LLD)52if(ZIG_FORCE_EXTERNAL_LLD)
56 find_package(lld)53 find_package(lld)
54 include_directories(${LLVM_INCLUDE_DIRS})
57 include_directories(${LLD_INCLUDE_DIRS})55 include_directories(${LLD_INCLUDE_DIRS})
56 include_directories(${CLANG_INCLUDE_DIRS})
58else()57else()
58 # This goes first so that we find embedded LLD instead
59 # of system LLD.
60 include_directories("${CMAKE_SOURCE_DIR}/deps/lld/include")
61
62 include_directories(${LLVM_INCLUDE_DIRS})
63 include_directories(${CLANG_INCLUDE_DIRS})
59 set(EMBEDDED_LLD_LIB_SOURCES64 set(EMBEDDED_LLD_LIB_SOURCES
60 "${CMAKE_SOURCE_DIR}/deps/lld/lib/Driver/DarwinLdDriver.cpp"65 "${CMAKE_SOURCE_DIR}/deps/lld/lib/Driver/DarwinLdDriver.cpp"
61 "${CMAKE_SOURCE_DIR}/deps/lld/lib/Config/Version.cpp"66 "${CMAKE_SOURCE_DIR}/deps/lld/lib/Config/Version.cpp"
src/zig_llvm.cpp+1-1
...@@ -789,7 +789,7 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_...@@ -789,7 +789,7 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_
789 zig_unreachable();789 zig_unreachable();
790790
791 case ZigLLVM_COFF:791 case ZigLLVM_COFF:
792 return lld::coff::link(array_ref_args);792 return lld::coff::link(array_ref_args, false, diag);
793793
794 case ZigLLVM_ELF:794 case ZigLLVM_ELF:
795 return lld::elf::link(array_ref_args, false, diag);795 return lld::elf::link(array_ref_args, false, diag);