Mesa (master): radeon/llvm: Fix build with LLVM 3.2

Tom Stellard tstellar at kemper.freedesktop.org
Thu Oct 11 21:37:11 UTC 2012


Module: Mesa
Branch: master
Commit: 4cc530f452436a5304a628d1428ed7f07247a175
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4cc530f452436a5304a628d1428ed7f07247a175

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Wed Oct 10 21:00:13 2012 +0000

radeon/llvm: Fix build with LLVM 3.2

---

 src/gallium/drivers/radeon/radeon_llvm_emit.cpp |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
index 2f2eb4c..21661a0 100644
--- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
@@ -36,13 +36,16 @@
 #include <llvm/Support/TargetRegistry.h>
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/Support/Threading.h>
-#include <llvm/Target/TargetData.h>
 #include <llvm/Target/TargetMachine.h>
-
 #include <llvm/Transforms/Scalar.h>
-
 #include <llvm-c/Target.h>
 
+#if HAVE_LLVM < 0x0302
+#include <llvm/Target/TargetData.h>
+#else
+#include <llvm/DataLayout.h>
+#endif
+
 #include <iostream>
 #include <stdlib.h>
 #include <stdio.h>
@@ -120,7 +123,11 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes,
                      ));
    TargetMachine &AMDGPUTargetMachine = *tm.get();
    PassManager PM;
+#if HAVE_LLVM < 0x0302
    PM.add(new TargetData(*AMDGPUTargetMachine.getTargetData()));
+#else
+   PM.add(new DataLayout(*AMDGPUTargetMachine.getDataLayout()));
+#endif
    PM.add(createPromoteMemoryToRegisterPass());
    AMDGPUTargetMachine.setAsmVerbosityDefault(true);
 




More information about the mesa-commit mailing list