From f38770bf2a6c84a6de3fda5edf6f3fd1a0ec7360 Mon Sep 17 00:00:00 2001
From: Matt Pharr <matt.pharr@intel.com>
Date: Thu, 28 Jun 2012 07:36:10 -0700
Subject: [PATCH] Fix build with LLVM ToT

---
 ctx.h    | 6 +++++-
 ispc.cpp | 6 +++++-
 opt.cpp  | 6 +++++-
 type.cpp | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ctx.h b/ctx.h
index 59975c01..d8963bbf 100644
--- a/ctx.h
+++ b/ctx.h
@@ -43,7 +43,11 @@
 #include <llvm/InstrTypes.h>
 #include <llvm/Instructions.h>
 #include <llvm/Analysis/DIBuilder.h>
-#include <llvm/Analysis/DebugInfo.h>
+#if defined(LLVM_3_0) || defined(LLVM_3_1)
+  #include <llvm/Analysis/DebugInfo.h>
+#else
+  #include <llvm/DebugInfo.h>
+#endif
 
 struct CFInfo;
 
diff --git a/ispc.cpp b/ispc.cpp
index a1d5c8f4..5be419ab 100644
--- a/ispc.cpp
+++ b/ispc.cpp
@@ -48,7 +48,11 @@
 #include <llvm/LLVMContext.h>
 #include <llvm/Module.h>
 #include <llvm/Analysis/DIBuilder.h>
-#include <llvm/Analysis/DebugInfo.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>
diff --git a/opt.cpp b/opt.cpp
index 0cb27bea..1456dfd7 100644
--- 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>
-#include <llvm/Analysis/DebugInfo.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>
diff --git a/type.cpp b/type.cpp
index ff772d78..f3584361 100644
--- a/type.cpp
+++ b/type.cpp
@@ -46,7 +46,11 @@
 #include <llvm/Value.h>
 #include <llvm/Module.h>
 #include <llvm/Analysis/DIBuilder.h>
-#include <llvm/Analysis/DebugInfo.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>