diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-10-23 21:43:18 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-11-02 21:54:24 -0400 |
| commit | 94ec2190f8d8c41d19b668511bf31fae32bcd095 (patch) | |
| tree | c5ab9b20fbaf8f017661f9a159082d1ecaf9f943 /src/zig_llvm.cpp | |
| parent | abff1b688420eb30d98145d8bc48e7d08f259885 (diff) | |
| download | zig-94ec2190f8d8c41d19b668511bf31fae32bcd095.tar.gz zig-94ec2190f8d8c41d19b668511bf31fae32bcd095.zip | |
update to llvm master
Diffstat (limited to 'src/zig_llvm.cpp')
| -rw-r--r-- | src/zig_llvm.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp index 0e1a067bc6..074fa4c712 100644 --- a/src/zig_llvm.cpp +++ b/src/zig_llvm.cpp @@ -37,7 +37,7 @@ #include <llvm/Transforms/IPO/AlwaysInliner.h> #include <llvm/Transforms/Scalar.h> -#include <lld/Driver/Driver.h> +#include <lld/Common/Driver.h> using namespace llvm; @@ -605,11 +605,13 @@ static_assert((Triple::ArchType)ZigLLVM_LastArchType == Triple::LastArchType, "" static_assert((Triple::VendorType)ZigLLVM_LastVendorType == Triple::LastVendorType, ""); static_assert((Triple::OSType)ZigLLVM_LastOSType == Triple::LastOSType, ""); static_assert((Triple::EnvironmentType)ZigLLVM_LastEnvironmentType == Triple::LastEnvironmentType, ""); +static_assert((Triple::SubArchType)ZigLLVM_KalimbaSubArch_v5 == Triple::KalimbaSubArch_v5, ""); static_assert((Triple::ObjectFormatType)ZigLLVM_UnknownObjectFormat == Triple::UnknownObjectFormat, ""); static_assert((Triple::ObjectFormatType)ZigLLVM_COFF == Triple::COFF, ""); static_assert((Triple::ObjectFormatType)ZigLLVM_ELF == Triple::ELF, ""); static_assert((Triple::ObjectFormatType)ZigLLVM_MachO == Triple::MachO, ""); +static_assert((Triple::ObjectFormatType)ZigLLVM_Wasm == Triple::Wasm, ""); const char *ZigLLVMGetArchTypeName(ZigLLVM_ArchType arch) { return (const char*)Triple::getArchTypeName((Triple::ArchType)arch).bytes_begin(); @@ -648,6 +650,8 @@ const char *ZigLLVMGetSubArchTypeName(ZigLLVM_SubArchType sub_arch) { switch (sub_arch) { case ZigLLVM_NoSubArch: return "(none)"; + case ZigLLVM_ARMSubArch_v8_3a: + return "v8_3a"; case ZigLLVM_ARMSubArch_v8_2a: return "v8_2a"; case ZigLLVM_ARMSubArch_v8_1a: @@ -775,7 +779,7 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_ zig_unreachable(); case ZigLLVM_COFF: - return lld::coff::link(array_ref_args); + return lld::coff::link(array_ref_args, false); case ZigLLVM_ELF: return lld::elf::link(array_ref_args, false, diag); |