gallivm: Fix build with LLVM 3.6 (r221751).

Tested with LLVM 3.3, 3.4, 3.5, and 3.6.

Trivial.
This commit is contained in:
José Fonseca 2014-11-12 10:32:38 +00:00
parent 7a82961b71
commit 977b18e486
1 changed files with 10 additions and 1 deletions

View File

@ -32,10 +32,11 @@
#include <llvm/Target/TargetInstrInfo.h>
#include <llvm/Support/raw_ostream.h>
#include <llvm/Support/Format.h>
#include <llvm/Support/MemoryObject.h>
#if HAVE_LLVM >= 0x0306
#include <llvm/Target/TargetSubtargetInfo.h>
#else
#include <llvm/Support/MemoryObject.h>
#endif
#include <llvm/Support/TargetRegistry.h>
@ -142,6 +143,8 @@ lp_debug_dump_value(LLVMValueRef value)
}
#if HAVE_LLVM < 0x0306
/*
* MemoryObject wrapper around a buffer of memory, to be used by MC
* disassembler.
@ -177,6 +180,8 @@ public:
}
};
#endif /* HAVE_LLVM < 0x0306 */
/*
* Disassemble a function, using the LLVM MC disassembler.
@ -280,7 +285,11 @@ disassemble(const void* func, llvm::raw_ostream & Out)
/*
* Wrap the data in a MemoryObject
*/
#if HAVE_LLVM >= 0x0306
ArrayRef<uint8_t> memoryObject((const uint8_t *)bytes, extent);
#else
BufferMemoryObject memoryObject((const uint8_t *)bytes, extent);
#endif
uint64_t pc;
pc = 0;