Merge pull request JuliaLang#22371 from singam-sanjay/fix_build_on_ll…

…vm-svn Fix compilation on LLVM svn.
dalum · Jun 15, 2017 · 887064e · 887064e
2 parents 9fdc6d1 + 65d38be
commit 887064e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp
@@ -29,6 +29,9 @@
 #else
 #include <llvm/ExecutionEngine/JITMemoryManager.h>
 #endif
+#if JL_LLVM_VERSION >= 50000
+#include <llvm/BinaryFormat/Magic.h>
+#endif
 #include <llvm/Object/MachO.h>
 #include <llvm/Object/COFF.h>
 #if JL_LLVM_VERSION >= 30700

diff --git a/src/disasm.cpp b/src/disasm.cpp
@@ -28,8 +28,13 @@
 
 #include "llvm-version.h"
 #include <llvm/Object/ObjectFile.h>
+#if JL_LLVM_VERSION >= 50000
+#include <llvm/BinaryFormat/MachO.h>
+#include <llvm/BinaryFormat/COFF.h>
+#else
 #include <llvm/Support/MachO.h>
 #include <llvm/Support/COFF.h>
+#endif
 #include <llvm/MC/MCInst.h>
 #include <llvm/MC/MCStreamer.h>
 #include <llvm/MC/MCSubtargetInfo.h>