summaryrefslogtreecommitdiff
path: root/src/compiler/llvm
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2013-03-10 20:26:16 -0700
committer Brian Carlstrom <bdc@google.com> 2013-03-11 15:47:02 -0700
commitbd86bccf1b47f1151842152ee52cf5d46d6b34ab (patch)
treec0c110b47435c6e8548f1b7126f9ea20da7fd934 /src/compiler/llvm
parent5d021c7399fa8090910d5b47ed00465a4e0e7e0f (diff)
Tracking rebase to jb-mr1-release
Change-Id: Ic2ae1a27682cc4152003a68d59068b2c5c5eb09b
Diffstat (limited to 'src/compiler/llvm')
-rw-r--r--src/compiler/llvm/intrinsic_helper.cc2
-rw-r--r--src/compiler/llvm/ir_builder.h2
-rw-r--r--src/compiler/llvm/llvm_compilation_unit.cc2
-rw-r--r--src/compiler/llvm/md_builder.cc2
-rw-r--r--src/compiler/llvm/md_builder.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/llvm/intrinsic_helper.cc b/src/compiler/llvm/intrinsic_helper.cc
index 39c4a586e2..ac34f7078f 100644
--- a/src/compiler/llvm/intrinsic_helper.cc
+++ b/src/compiler/llvm/intrinsic_helper.cc
@@ -20,8 +20,8 @@
#include <llvm/DerivedTypes.h>
#include <llvm/Function.h>
+#include <llvm/IRBuilder.h>
#include <llvm/Intrinsics.h>
-#include <llvm/Support/IRBuilder.h>
namespace art {
namespace llvm {
diff --git a/src/compiler/llvm/ir_builder.h b/src/compiler/llvm/ir_builder.h
index 9362a751da..32f0bf9696 100644
--- a/src/compiler/llvm/ir_builder.h
+++ b/src/compiler/llvm/ir_builder.h
@@ -26,8 +26,8 @@
#include <llvm/Constants.h>
#include <llvm/DerivedTypes.h>
+#include <llvm/IRBuilder.h>
#include <llvm/LLVMContext.h>
-#include <llvm/Support/IRBuilder.h>
#include <llvm/Support/NoFolder.h>
#include <llvm/Type.h>
diff --git a/src/compiler/llvm/llvm_compilation_unit.cc b/src/compiler/llvm/llvm_compilation_unit.cc
index 3783ae99e0..41c603f349 100644
--- a/src/compiler/llvm/llvm_compilation_unit.cc
+++ b/src/compiler/llvm/llvm_compilation_unit.cc
@@ -26,7 +26,6 @@
#include <llvm/ADT/StringSet.h>
#include <llvm/ADT/Triple.h>
#include <llvm/Analysis/CallGraph.h>
-#include <llvm/Analysis/DebugInfo.h>
#include <llvm/Analysis/Dominators.h>
#include <llvm/Analysis/LoopInfo.h>
#include <llvm/Analysis/LoopPass.h>
@@ -39,6 +38,7 @@
#include <llvm/CodeGen/MachineFrameInfo.h>
#include <llvm/CodeGen/MachineFunction.h>
#include <llvm/CodeGen/MachineFunctionPass.h>
+#include <llvm/DebugInfo.h>
#include <llvm/DerivedTypes.h>
#include <llvm/LLVMContext.h>
#include <llvm/Module.h>
diff --git a/src/compiler/llvm/md_builder.cc b/src/compiler/llvm/md_builder.cc
index afb36111eb..657adc5f11 100644
--- a/src/compiler/llvm/md_builder.cc
+++ b/src/compiler/llvm/md_builder.cc
@@ -17,7 +17,7 @@
#include "md_builder.h"
-#include "llvm/Support/MDBuilder.h"
+#include "llvm/MDBuilder.h"
#include <string>
diff --git a/src/compiler/llvm/md_builder.h b/src/compiler/llvm/md_builder.h
index 5231c14f07..5272ee5a95 100644
--- a/src/compiler/llvm/md_builder.h
+++ b/src/compiler/llvm/md_builder.h
@@ -19,7 +19,7 @@
#include "backend_types.h"
-#include "llvm/Support/MDBuilder.h"
+#include "llvm/MDBuilder.h"
#include <cstring>