Fix build with LLVM ToT

2012-06-28 07:36:10 -07:00
parent 2a4dff38d0
commit f38770bf2a
4 changed files with 20 additions and 4 deletions
--- a/ctx.h
+++ b/ctx.h
@@ -43,7 +43,11 @@
 #include <llvm/InstrTypes.h>
 #include <llvm/Instructions.h>
 #include <llvm/Analysis/DIBuilder.h>
+#if defined(LLVM_3_0) || defined(LLVM_3_1)
  #include <llvm/Analysis/DebugInfo.h>
+#else
+  #include <llvm/DebugInfo.h>
+#endif

 struct CFInfo;

--- a/ispc.cpp
+++ b/ispc.cpp
@@ -48,7 +48,11 @@
 #include <llvm/LLVMContext.h>
 #include <llvm/Module.h>
 #include <llvm/Analysis/DIBuilder.h>
+#if defined(LLVM_3_0) || defined(LLVM_3_1)
  #include <llvm/Analysis/DebugInfo.h>
+#else
+  #include <llvm/DebugInfo.h>
+#endif
 #include <llvm/Support/Dwarf.h>
 #include <llvm/Instructions.h>
 #include <llvm/Target/TargetMachine.h>
--- a/opt.cpp
+++ b/opt.cpp
@@ -69,7 +69,11 @@
 #include <llvm/Analysis/Verifier.h>
 #include <llvm/Analysis/Passes.h>
 #include <llvm/Support/raw_ostream.h>
+#if defined(LLVM_3_0) || defined(LLVM_3_1)
  #include <llvm/Analysis/DebugInfo.h>
+#else
+  #include <llvm/DebugInfo.h>
+#endif
 #include <llvm/Support/Dwarf.h>
 #ifdef ISPC_IS_LINUX
  #include <alloca.h>
--- a/type.cpp
+++ b/type.cpp
@@ -46,7 +46,11 @@
 #include <llvm/Value.h>
 #include <llvm/Module.h>
 #include <llvm/Analysis/DIBuilder.h>
+#if defined(LLVM_3_0) || defined(LLVM_3_1)
  #include <llvm/Analysis/DebugInfo.h>
+#else
+  #include <llvm/DebugInfo.h>
+#endif
 #include <llvm/Support/Dwarf.h>