summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_debug.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 4f9546a..402d29e 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -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;