diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/drivers/r600/llvm_wrapper.cpp | 4 | ||||
-rw-r--r-- | src/gallium/drivers/radeon/radeon_llvm_emit.cpp | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/llvm_wrapper.cpp b/src/gallium/drivers/r600/llvm_wrapper.cpp index 81f53974d11..ae2f4d24f74 100644 --- a/src/gallium/drivers/r600/llvm_wrapper.cpp +++ b/src/gallium/drivers/r600/llvm_wrapper.cpp @@ -1,6 +1,10 @@ #include <llvm/ADT/OwningPtr.h> #include <llvm/ADT/StringRef.h> +#if HAVE_LLVM < 0x0303 #include <llvm/LLVMContext.h> +#else +#include <llvm/IR/LLVMContext.h> +#endif #include <llvm/PassManager.h> #include <llvm/Support/IRReader.h> #include <llvm/Support/MemoryBuffer.h> diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp index 903e1028a09..0491e64bb6f 100644 --- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp +++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp @@ -25,8 +25,16 @@ */ #include "radeon_llvm_emit.h" +#if HAVE_LLVM < 0x0303 #include <llvm/LLVMContext.h> #include <llvm/Module.h> +#include <llvm/DataLayout.h> +#else +#include <llvm/IR/LLVMContext.h> +#include <llvm/IR/Module.h> +#include <llvm/IR/DataLayout.h> +#endif + #include <llvm/PassManager.h> #include <llvm/ADT/Triple.h> #include <llvm/Support/FormattedStream.h> @@ -39,7 +47,6 @@ #include <llvm/Target/TargetMachine.h> #include <llvm/Transforms/Scalar.h> #include <llvm-c/Target.h> -#include <llvm/DataLayout.h> #include <iostream> #include <stdlib.h> |