diff options
| author | Stephen Hines <srhines@google.com> | 2012-09-13 19:09:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-13 19:09:21 -0700 |
| commit | 356eedbdcc13dcfdf56bfee99da582532d134370 (patch) | |
| tree | 4c816050f64e6b7de0984adb5cd3a0a6723c3703 /lib | |
| parent | 78c041bd883d86c81c42b98f326660277e6d0d9a (diff) | |
| parent | 68aeecc773d36c4be9adf32d1f09ec739574c880 (diff) | |
| download | external_llvm-356eedbdcc13dcfdf56bfee99da582532d134370.zip external_llvm-356eedbdcc13dcfdf56bfee99da582532d134370.tar.gz external_llvm-356eedbdcc13dcfdf56bfee99da582532d134370.tar.bz2 | |
am 68aeecc7: Merge up through LLVM r163557.
* commit '68aeecc773d36c4be9adf32d1f09ec739574c880':
Merge up through LLVM r163557.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Analysis/Android.mk | 2 | ||||
| -rw-r--r-- | lib/CodeGen/Android.mk | 1 | ||||
| -rw-r--r-- | lib/Target/Mips/Android.mk | 13 | ||||
| -rw-r--r-- | lib/Transforms/Instrumentation/Android.mk | 2 | ||||
| -rw-r--r-- | lib/Transforms/Utils/Android.mk | 1 |
5 files changed, 12 insertions, 7 deletions
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk index 19c58f3..2ebf091 100644 --- a/lib/Analysis/Android.mk +++ b/lib/Analysis/Android.mk @@ -41,6 +41,8 @@ analysis_SRC_FILES := \ PathProfileInfo.cpp \ PathProfileVerifier.cpp \ PostDominators.cpp \ + ProfileDataLoader.cpp \ + ProfileDataLoaderPass.cpp \ ProfileEstimatorPass.cpp \ ProfileInfo.cpp \ ProfileInfoLoader.cpp \ diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk index 03cf03b..57c4a9b 100644 --- a/lib/CodeGen/Android.mk +++ b/lib/CodeGen/Android.mk @@ -93,6 +93,7 @@ codegen_SRC_FILES := \ SpillPlacement.cpp \ Spiller.cpp \ SplitKit.cpp \ + StackColoring.cpp \ StackProtector.cpp \ StackSlotColoring.cpp \ StrongPHIElimination.cpp \ diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk index 11e8997..af24a5a 100644 --- a/lib/Target/Mips/Android.mk +++ b/lib/Target/Mips/Android.mk @@ -11,10 +11,14 @@ mips_codegen_TBLGEN_TABLES := \ MipsGenSubtargetInfo.inc mips_codegen_SRC_FILES := \ + Mips16FrameLowering.cpp \ + Mips16InstrInfo.cpp \ + Mips16RegisterInfo.cpp \ MipsAnalyzeImmediate.cpp \ MipsAsmPrinter.cpp \ MipsCodeEmitter.cpp \ MipsDelaySlotFiller.cpp \ + MipsDirectObjLower.cpp \ MipsELFWriterInfo.cpp \ MipsFrameLowering.cpp \ MipsInstrInfo.cpp \ @@ -25,16 +29,13 @@ mips_codegen_SRC_FILES := \ MipsMachineFunction.cpp \ MipsMCInstLower.cpp \ MipsRegisterInfo.cpp \ - MipsSubtarget.cpp \ MipsSEFrameLowering.cpp \ MipsSEInstrInfo.cpp \ MipsSERegisterInfo.cpp \ - MipsTargetMachine.cpp \ - MipsTargetObjectFile.cpp \ MipsSelectionDAGInfo.cpp \ - Mips16FrameLowering.cpp \ - Mips16InstrInfo.cpp \ - Mips16RegisterInfo.cpp + MipsSubtarget.cpp \ + MipsTargetMachine.cpp \ + MipsTargetObjectFile.cpp # For the host # ===================================================== diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk index cc7a9da..a6512bf 100644 --- a/lib/Transforms/Instrumentation/Android.mk +++ b/lib/Transforms/Instrumentation/Android.mk @@ -2,9 +2,9 @@ LOCAL_PATH:= $(call my-dir) instrumentation_SRC_FILES := \ AddressSanitizer.cpp \ + BlackList.cpp \ BoundsChecking.cpp \ EdgeProfiling.cpp \ - FunctionBlackList.cpp \ GCOVProfiling.cpp \ Instrumentation.cpp \ OptimalEdgeProfiling.cpp \ diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk index 5a908d0..c3f0789 100644 --- a/lib/Transforms/Utils/Android.mk +++ b/lib/Transforms/Utils/Android.mk @@ -5,6 +5,7 @@ transforms_utils_SRC_FILES := \ BasicBlockUtils.cpp \ BreakCriticalEdges.cpp \ BuildLibCalls.cpp \ + BypassSlowDivision.cpp \ CloneFunction.cpp \ CloneModule.cpp \ CmpInstAnalysis.cpp \ |