summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Droste <tdroste@gmx.de>2011-09-04 03:14:23 +0200
committerJosé Fonseca <jfonseca@vmware.com>2011-09-05 18:49:11 +0100
commit4a468de2d78fc5a9e6de40a9dae09669ec556fc5 (patch)
treecde80b88a8fda9b2275a3a2948abc2ad20dad18c
parent0dc575c6f6157867accf749a06ec745617ea64ac (diff)
downloadexternal_mesa3d-4a468de2d78fc5a9e6de40a9dae09669ec556fc5.zip
external_mesa3d-4a468de2d78fc5a9e6de40a9dae09669ec556fc5.tar.gz
external_mesa3d-4a468de2d78fc5a9e6de40a9dae09669ec556fc5.tar.bz2
gallivm: fix build with LLVM 3.0svn
LLVM 3.0svn moved TargetRegistry.h and TargetSelect.h. See revision 138450 of LLVM. Signed-off-by: Tobias Droste <tdroste@gmx.de>
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_debug.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index e252607..401e0e2 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -27,17 +27,23 @@
#include <llvm-c/Core.h>
#include <llvm/Target/TargetMachine.h>
-#include <llvm/Target/TargetRegistry.h>
-#include <llvm/Target/TargetSelect.h>
#include <llvm/Target/TargetInstrInfo.h>
#include <llvm/Support/raw_ostream.h>
#include <llvm/Support/MemoryObject.h>
+#if HAVE_LLVM >= 0x0300
+#include <llvm/Support/TargetRegistry.h>
+#include <llvm/Support/TargetSelect.h>
+#else /* HAVE_LLVM < 0x0300 */
+#include <llvm/Target/TargetRegistry.h>
+#include <llvm/Target/TargetSelect.h>
+#endif /* HAVE_LLVM < 0x0300 */
+
#if HAVE_LLVM >= 0x0209
#include <llvm/Support/Host.h>
-#else
+#else /* HAVE_LLVM < 0x0209 */
#include <llvm/System/Host.h>
-#endif
+#endif /* HAVE_LLVM < 0x0209 */
#if HAVE_LLVM >= 0x0207
#include <llvm/MC/MCDisassembler.h>