Merge pull request JuliaLang#10511 from samuelpowell/master

Fix build against LLVM post r231861 (JuliaLang#10509)
tekverkp · Mar 13, 2015 · 9cd496e · 9cd496e
2 parents d87e303 + 2dfaa71
commit 9cd496e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/disasm.cpp b/src/disasm.cpp
@@ -340,7 +340,11 @@ void jl_dump_function_asm(uintptr_t Fptr, size_t Fsize, size_t slide,
  MCCodeEmitter *CE = 0;
  MCAsmBackend *MAB = 0;
  if (ShowEncoding) {
+#ifdef LLVM37
+ CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, Ctx);
+#else
  CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, *STI, Ctx);
+#endif
 #ifdef LLVM34
  MAB = TheTarget->createMCAsmBackend(*MRI, TripleName, MCPU);
 #else