diff options
| author | Stephen Hines <srhines@google.com> | 2013-05-03 13:11:35 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-05-06 16:53:29 -0700 |
| commit | 9dbeb69a345d12b15571769cfacf1d5e1a7ce378 (patch) | |
| tree | e4e0834e7992020cda261207ae7f7093474c1736 /lib/CodeGen | |
| parent | 38578c4919ea18ceb27e29988b2d857afe6215bf (diff) | |
| download | external_llvm-9dbeb69a345d12b15571769cfacf1d5e1a7ce378.zip external_llvm-9dbeb69a345d12b15571769cfacf1d5e1a7ce378.tar.gz external_llvm-9dbeb69a345d12b15571769cfacf1d5e1a7ce378.tar.bz2 | |
Update LLVM for merge to r180947.
Change-Id: Ic9e7daa7ef3789298c49a7b308af92115f5d682d
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/Android.mk | 20 | ||||
| -rw-r--r-- | lib/CodeGen/AsmPrinter/Android.mk | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk index 3a06d4b..3ac7c19 100644 --- a/lib/CodeGen/Android.mk +++ b/lib/CodeGen/Android.mk @@ -9,13 +9,13 @@ codegen_SRC_FILES := \ CalcSpillWeights.cpp \ CallingConvLower.cpp \ CodeGen.cpp \ - CodePlacementOpt.cpp \ CriticalAntiDepBreaker.cpp \ - DFAPacketizer.cpp \ DeadMachineInstructionElim.cpp \ + DFAPacketizer.cpp \ DwarfEHPrepare.cpp \ EarlyIfConversion.cpp \ EdgeBundles.cpp \ + ErlangGC.cpp \ ExecutionDepsFix.cpp \ ExpandISelPseudos.cpp \ ExpandPostRAPseudos.cpp \ @@ -30,8 +30,8 @@ codegen_SRC_FILES := \ LatencyPriorityQueue.cpp \ LexicalScopes.cpp \ LiveDebugVariables.cpp \ - LiveInterval.cpp \ LiveIntervalAnalysis.cpp \ + LiveInterval.cpp \ LiveIntervalUnion.cpp \ LiveRangeCalc.cpp \ LiveRangeEdit.cpp \ @@ -44,16 +44,16 @@ codegen_SRC_FILES := \ MachineBlockFrequencyInfo.cpp \ MachineBlockPlacement.cpp \ MachineBranchProbabilityInfo.cpp \ - MachineCSE.cpp \ MachineCodeEmitter.cpp \ MachineCopyPropagation.cpp \ + MachineCSE.cpp \ MachineDominators.cpp \ - MachineFunction.cpp \ MachineFunctionAnalysis.cpp \ + MachineFunction.cpp \ MachineFunctionPass.cpp \ MachineFunctionPrinterPass.cpp \ - MachineInstr.cpp \ MachineInstrBundle.cpp \ + MachineInstr.cpp \ MachineLICM.cpp \ MachineLoopInfo.cpp \ MachineModuleInfo.cpp \ @@ -61,17 +61,17 @@ codegen_SRC_FILES := \ MachinePassRegistry.cpp \ MachinePostDominators.cpp \ MachineRegisterInfo.cpp \ - MachineSSAUpdater.cpp \ MachineScheduler.cpp \ MachineSink.cpp \ + MachineSSAUpdater.cpp \ MachineTraceMetrics.cpp \ MachineVerifier.cpp \ OcamlGC.cpp \ OptimizePHIs.cpp \ - PHIElimination.cpp \ - PHIEliminationUtils.cpp \ Passes.cpp \ PeepholeOptimizer.cpp \ + PHIElimination.cpp \ + PHIEliminationUtils.cpp \ PostRASchedulerList.cpp \ ProcessImplicitDefs.cpp \ PrologEpilogInserter.cpp \ @@ -93,8 +93,8 @@ codegen_SRC_FILES := \ ShrinkWrapping.cpp \ SjLjEHPrepare.cpp \ SlotIndexes.cpp \ - SpillPlacement.cpp \ Spiller.cpp \ + SpillPlacement.cpp \ SplitKit.cpp \ StackColoring.cpp \ StackProtector.cpp \ diff --git a/lib/CodeGen/AsmPrinter/Android.mk b/lib/CodeGen/AsmPrinter/Android.mk index ce0f49b..d408475 100644 --- a/lib/CodeGen/AsmPrinter/Android.mk +++ b/lib/CodeGen/AsmPrinter/Android.mk @@ -18,6 +18,7 @@ LOCAL_SRC_FILES := \ DwarfCompileUnit.cpp \ DwarfDebug.cpp \ DwarfException.cpp \ + ErlangGCPrinter.cpp \ OcamlGCPrinter.cpp \ Win64Exception.cpp @@ -26,6 +27,7 @@ LOCAL_MODULE:= libLLVMAsmPrinter LOCAL_MODULE_TAGS := optional include $(LLVM_HOST_BUILD_MK) +include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_HOST_STATIC_LIBRARY) # For the device @@ -43,6 +45,7 @@ LOCAL_SRC_FILES := \ DwarfCompileUnit.cpp \ DwarfDebug.cpp \ DwarfException.cpp \ + ErlangGCPrinter.cpp \ Win64Exception.cpp \ $(LOCAL_SRC_FILES) @@ -51,4 +54,5 @@ LOCAL_MODULE:= libLLVMAsmPrinter LOCAL_MODULE_TAGS := optional include $(LLVM_DEVICE_BUILD_MK) +include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_STATIC_LIBRARY) |