diff options
| author | Stephen Hines <srhines@google.com> | 2013-03-18 17:55:03 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-03-18 20:38:36 -0700 |
| commit | d212f3fdfcfd01d5bc24ac4614b7e23478432f80 (patch) | |
| tree | 510cd83b37261c7105edb8549dee1ba1d27cd6c5 | |
| parent | 2d4629c5d7dcc6582fa7b85a517744f1a3654eba (diff) | |
| download | external_llvm-d212f3fdfcfd01d5bc24ac4614b7e23478432f80.zip external_llvm-d212f3fdfcfd01d5bc24ac4614b7e23478432f80.tar.gz external_llvm-d212f3fdfcfd01d5bc24ac4614b7e23478432f80.tar.bz2 | |
Update LLVM for merge to r177342.
Change-Id: Ie489c8fab15789330f6ac968087ba14953dfacca
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | README.android | 3 | ||||
| -rw-r--r-- | lib/Analysis/Android.mk | 1 | ||||
| -rw-r--r-- | lib/Target/ARM/Android.mk | 1 | ||||
| -rw-r--r-- | lib/Target/Mips/Android.mk | 5 |
5 files changed, 9 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index aa21896..f756f04 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -51,3 +51,4 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/stingray/obj/STATIC_LIBR $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/stingray/obj/STATIC_LIBRARIES/libLLVMARMCodeGen_intermediates*) $(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_PREBUILT_TAG)/obj/STATIC_LIBRARIES/libLLVMARM*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libLLVMARM*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/app_process__asan_intermediates*) diff --git a/README.android b/README.android index 8287705..80ed36a 100644 --- a/README.android +++ b/README.android @@ -20,8 +20,9 @@ * For Ice Cream Sandwich MR2: Synced to upstream r146714 * For Jellybean: Synced to upstream r155090 * For Jellybean MR1: Synced to upstream r162314 -* For Jellybean MR2: Synced to upstream r176139 +* For Jellybean MR2: Synced to upstream r177342 +* Recent downstreaming on 2013/3/18: Synced to r177342 (Contact srhines for merge questions.) * Recent downstreaming on 2013/3/5: Synced to r176139 (Contact srhines for merge questions.) * Recent downstreaming on 2013/1/8: Synced to r171905 (Contact srhines for merge questions.) * Recent downstreaming on 2012/8/23: Synced to r162314 (Contact srhines for merge questions.) diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk index 6153df4..74fa9d7 100644 --- a/lib/Analysis/Android.mk +++ b/lib/Analysis/Android.mk @@ -15,7 +15,6 @@ analysis_SRC_FILES := \ CodeMetrics.cpp \ ConstantFolding.cpp \ CostModel.cpp \ - DbgInfoPrinter.cpp \ DependenceAnalysis.cpp \ DomPrinter.cpp \ DominanceFrontier.cpp \ diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk index 0c8d7fd..25b0d89 100644 --- a/lib/Target/ARM/Android.mk +++ b/lib/Target/ARM/Android.mk @@ -15,6 +15,7 @@ arm_codegen_TBLGEN_TABLES := \ ARMGenDisassemblerTables.inc arm_codegen_SRC_FILES := \ + A15SDOptimizer.cpp \ ARMAsmPrinter.cpp \ ARMBaseInstrInfo.cpp \ ARMBaseRegisterInfo.cpp \ diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk index 44271e9..c7ee89f 100644 --- a/lib/Target/Mips/Android.mk +++ b/lib/Target/Mips/Android.mk @@ -13,11 +13,14 @@ mips_codegen_TBLGEN_TABLES := \ mips_codegen_SRC_FILES := \ Mips16FrameLowering.cpp \ + Mips16ISelDAGToDAG.cpp \ + Mips16ISelLowering.cpp \ Mips16InstrInfo.cpp \ Mips16RegisterInfo.cpp \ MipsAnalyzeImmediate.cpp \ MipsAsmPrinter.cpp \ MipsCodeEmitter.cpp \ + MipsConstantIslandPass.cpp \ MipsDelaySlotFiller.cpp \ MipsFrameLowering.cpp \ MipsInstrInfo.cpp \ @@ -29,6 +32,8 @@ mips_codegen_SRC_FILES := \ MipsMCInstLower.cpp \ MipsRegisterInfo.cpp \ MipsSEFrameLowering.cpp \ + MipsSEISelDAGToDAG.cpp \ + MipsSEISelLowering.cpp \ MipsSEInstrInfo.cpp \ MipsSERegisterInfo.cpp \ MipsSelectionDAGInfo.cpp \ |