diff options
author | Logan Chien <loganchien@google.com> | 2011-11-15 15:53:51 +0800 |
---|---|---|
committer | Logan Chien <loganchien@google.com> | 2011-11-15 15:53:51 +0800 |
commit | 36abbec01815964352d4f3d391c0a03896c0095a (patch) | |
tree | 949ae6594df546916cb23a688082138f29379b35 /lib | |
parent | f9c1b92c27bf4ac40a52e0f1ef6d006d7e74bed3 (diff) | |
download | external_llvm-36abbec01815964352d4f3d391c0a03896c0095a.tar.gz external_llvm-36abbec01815964352d4f3d391c0a03896c0095a.tar.bz2 external_llvm-36abbec01815964352d4f3d391c0a03896c0095a.zip |
Apply changes to migrate to llvm upstream r144606.
Change-Id: Id22edd55de42831bdc3fc1a143ebec10cf8476d2
Diffstat (limited to 'lib')
-rw-r--r-- | lib/CodeGen/Android.mk | 6 | ||||
-rw-r--r-- | lib/Target/ARM/ARMJITInfo.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk index adef8ef52a..3cb28562a7 100644 --- a/lib/CodeGen/Android.mk +++ b/lib/CodeGen/Android.mk @@ -72,10 +72,9 @@ codegen_SRC_FILES := \ RegAllocBasic.cpp \ RegAllocFast.cpp \ RegAllocGreedy.cpp \ - RegAllocLinearScan.cpp \ RegAllocPBQP.cpp \ - RegisterCoalescer.cpp \ RegisterClassInfo.cpp \ + RegisterCoalescer.cpp \ RegisterScavenging.cpp \ RenderMachineFunction.cpp \ ScheduleDAG.cpp \ @@ -99,8 +98,7 @@ codegen_SRC_FILES := \ TargetLoweringObjectFileImpl.cpp \ TwoAddressInstructionPass.cpp \ UnreachableBlockElim.cpp \ - VirtRegMap.cpp \ - VirtRegRewriter.cpp + VirtRegMap.cpp # For the host # ===================================================== diff --git a/lib/Target/ARM/ARMJITInfo.cpp b/lib/Target/ARM/ARMJITInfo.cpp index 11f1b33db8..afbe0e43e3 100644 --- a/lib/Target/ARM/ARMJITInfo.cpp +++ b/lib/Target/ARM/ARMJITInfo.cpp @@ -15,9 +15,9 @@ #include "ARMJITInfo.h" #include "ARMInstrInfo.h" #include "ARMConstantPoolValue.h" -#include "ARMAddressingModes.h" #include "ARMRelocations.h" #include "ARMSubtarget.h" +#include "MCTargetDesc/ARMAddressingModes.h" #include "llvm/Function.h" #include "llvm/CodeGen/JITCodeEmitter.h" #include "llvm/Support/Debug.h" |