Skip to content

Commit

Permalink
Merge pull request JuliaLang#9815 from drepper/fix-llvm34
Browse files Browse the repository at this point in the history
Fix compiling with system llvm 3.4
ihnorton committed Jan 17, 2015
2 parents ffc9778 + 3810970 commit 4b20e10
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/disasm.cpp
Original file line number Diff line number Diff line change
@@ -383,6 +383,11 @@ void jl_dump_function_asm(const char *Fptr, size_t Fsize,
OpInfoLookup,
SymbolLookup,
&DisInfo)));
#elif defined LLVM34
OwningPtr<MCRelocationInfo> relinfo(new MCRelocationInfo(Ctx));
DisAsm->setupForSymbolicDisassembly(
OpInfoLookup, SymbolLookup, &DisInfo, &Ctx,
relinfo);
#else
DisAsm->setupForSymbolicDisassembly(
OpInfoLookup, SymbolLookup, &DisInfo, &Ctx);
@@ -479,7 +484,7 @@ void jl_dump_function_asm(const char *Fptr, size_t Fsize,
// Pass 0: Record all branch targets
if (MCIA->isBranch(Inst)) {
uint64_t addr;
#ifdef LLVM35
#ifdef LLVM34
if (MCIA->evaluateBranch(Inst, Index, insSize, addr))
#else
if ((addr = MCIA->evaluateBranch(Inst, Index, insSize)) != (uint64_t)-1)

0 comments on commit 4b20e10

Please sign in to comment.