[Mesa-dev] [PATCH] gallium: Fix build with LLVM >= r180881

[Tom Stellard]

On Thu, May 02, 2013 at 05:18:51PM +0200, Armin K. wrote:
> On 05/02/2013 04:56 PM, Tom Stellard wrote:
> >From: Tom Stellard <thomas.stellard at amd.com>
> >
> >---
> >  src/gallium/auxiliary/gallivm/lp_bld_misc.cpp   | 9 ++++++++-
> >  src/gallium/drivers/radeon/radeon_llvm_emit.cpp | 2 +-
> >  2 files changed, 9 insertions(+), 2 deletions(-)
> >
> >diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> >index 717afa7..a1143f7 100644
> >--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> >+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> >@@ -68,7 +68,14 @@
> >  #endif /* HAVE_LLVM < 0x0300 */
> >
> >  #if HAVE_LLVM >= 0x0303
> >-#include <llvm/Wrap.h>
> >+#include <llvm/ExecutionEngine/ExecutionEngine.h>
> >+#include <llvm/IR/Instructions.h>
> >+#include <llvm/IR/IRBuilder.h>
> >+#include <llvm/IR/LLVMContext.h>
> >+#include <llvm/IR/Module.h>
> >+#include <llvm/IR/Type.h>
> >+#include <llvm/IR/Value.h>
> >+#include <llvm/PassRegistry.h>
> >  #endif
> >
> >  #include "pipe/p_config.h"
> >diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
> >index 55dad9b..54b2d60 100644
> >--- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
> >+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
> >@@ -39,6 +39,7 @@
> >
> >  #include <llvm/PassManager.h>
> >  #include <llvm/ADT/Triple.h>
> >+#include <llvm/IR/Value.h>
> >  #include <llvm/Support/FormattedStream.h>
> >  #include <llvm/Support/Host.h>
> >  #include <llvm/Support/SourceMgr.h>
> >@@ -47,7 +48,6 @@
> >  #include <llvm/Support/Threading.h>
> >  #include <llvm/Target/TargetMachine.h>
> >  #include <llvm/Transforms/Scalar.h>
> >-#include <llvm/Wrap.h>
> >  #include <llvm-c/Target.h>
> >
> >  #include <iostream>
> >
> 
> Heh, I sent two patches today that fix the issue, too. A bit
> different, but they do the job.

I've pushed your patches with one minor change, thanks!

-Tom