From 26b1637279c45760c7242f466aed67d8dc4a38ce Mon Sep 17 00:00:00 2001
From: Tom Stellard <thomas.stellard@amd.com>
Date: Thu, 2 May 2013 07:55:01 -0700
Subject: [PATCH] gallium: Fix build with LLVM >= r180881

---
 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>
-- 
1.7.11.4