Update LLVM for merge to r180947.

Change-Id: Ic9e7daa7ef3789298c49a7b308af92115f5d682d

15 files changed, 67 insertions, 14 deletions

diff --git a/Android.mk b/Android.mk
index e863fb3..c495e6c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,6 +17,7 @@ subdirs := \
   lib/CodeGen/AsmPrinter \
   lib/CodeGen/SelectionDAG \
   lib/IR \
+  lib/IRReader \
   lib/Linker \
   lib/MC \
   lib/MC/MCParser \
diff --git a/README.android b/README.android
index 80ed36a..4fe6f85 100644
--- a/README.android
+++ b/README.android
@@ -12,7 +12,7 @@
  * conflicts.
  */
 
-* For Honeycomb: Synced to upstream r112344.
+* For Honeycomb: Synced to upstream r112344
 * For Honeycomb MR1: Synced to upstream r119309
 * For Honeycomb MR2: Synced to upstream r119309
 * For Ice Cream Sandwich: Synced to upstream r135569
@@ -21,7 +21,9 @@
 * For Jellybean: Synced to upstream r155090
 * For Jellybean MR1: Synced to upstream r162314
 * For Jellybean MR2: Synced to upstream r177342
+* For Key Lime Pie: Synced to upstream r180947
 
+* Recent downstreaming on 2013/5/3: Synced to r180947 (Contact srhines for merge questions.)
 * 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.)
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)
diff --git a/lib/IRReader/Android.mk b/lib/IRReader/Android.mk
new file mode 100644
index 0000000..eef5de6
--- /dev/null
+++ b/lib/IRReader/Android.mk
@@ -0,0 +1,36 @@
+LOCAL_PATH:= $(call my-dir)
+
+irreader_SRC_FILES := \
+  IRReader.cpp
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+REQUIRES_RTTI := 1
+
+LOCAL_SRC_FILES := $(irreader_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMIRReader
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+REQUIRES_RTTI := 1
+
+LOCAL_SRC_FILES := $(irreader_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMIRReader
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/Object/Android.mk b/lib/Object/Android.mk
index d7ba85d..e4f499d 100644
--- a/lib/Object/Android.mk
+++ b/lib/Object/Android.mk
@@ -6,7 +6,6 @@ object_SRC_FILES := \
   COFFObjectFile.cpp \
   ELFObjectFile.cpp \
   Error.cpp \
-  MachOObject.cpp \
   MachOObjectFile.cpp \
   Object.cpp \
   ObjectFile.cpp
diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index be3b2e6..11c6b36 100644
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -69,6 +69,7 @@ support_SRC_FILES := \
   Triple.cpp \
   Twine.cpp \
   Valgrind.cpp \
+  Watchdog.cpp \
   circular_raw_ostream.cpp \
   raw_os_ostream.cpp \
   raw_ostream.cpp \
diff --git a/lib/Target/ARM/MCTargetDesc/Android.mk b/lib/Target/ARM/MCTargetDesc/Android.mk
index b283ec5..111cc5e 100644
--- a/lib/Target/ARM/MCTargetDesc/Android.mk
+++ b/lib/Target/ARM/MCTargetDesc/Android.mk
@@ -14,7 +14,8 @@ arm_mc_desc_SRC_FILES := \
   ARMMCCodeEmitter.cpp \
   ARMMCExpr.cpp \
   ARMMCTargetDesc.cpp \
-  ARMMachObjectWriter.cpp
+  ARMMachObjectWriter.cpp \
+  ARMUnwindOpAsm.cpp
 
 # For the host
 # =====================================================
diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index c7ee89f..65222d2 100644
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -30,6 +30,8 @@ mips_codegen_SRC_FILES := \
   MipsLongBranch.cpp \
   MipsMachineFunction.cpp \
   MipsMCInstLower.cpp \
+  MipsModuleISelDAGToDAG.cpp \
+  MipsOs16.cpp \
   MipsRegisterInfo.cpp \
   MipsSEFrameLowering.cpp \
   MipsSEISelDAGToDAG.cpp \
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index f159bb2..a9c413d 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -15,6 +15,7 @@ x86_codegen_SRC_FILES := \
   X86COFFMachineModuleInfo.cpp \
   X86CodeEmitter.cpp \
   X86FastISel.cpp \
+  X86FixupLEAs.cpp \
   X86FloatingPoint.cpp \
   X86FrameLowering.cpp \
   X86ISelDAGToDAG.cpp \
diff --git a/lib/Transforms/Vectorize/Android.mk b/lib/Transforms/Vectorize/Android.mk
index de03793..58698fe 100644
--- a/lib/Transforms/Vectorize/Android.mk
+++ b/lib/Transforms/Vectorize/Android.mk
@@ -3,7 +3,9 @@ LOCAL_PATH:= $(call my-dir)
 transforms_vectorize_SRC_FILES := \
   BBVectorize.cpp \
   LoopVectorize.cpp \
-  Vectorize.cpp
+  SLPVectorizer.cpp \
+  Vectorize.cpp \
+  VecUtils.cpp
 
 # For the host
 # =====================================================
diff --git a/shared_llvm.mk b/shared_llvm.mk
index 2ca7616..3fac2f5 100644
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -6,6 +6,7 @@ LOCAL_PATH:= $(call my-dir)
 llvm_pre_static_libraries := \
   libLLVMLinker \
   libLLVMipo \
+  libLLVMIRReader \
   libLLVMBitWriter \
   libLLVMBitReader
 
diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index f74e9a7..ddaed0e 100644
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -36,6 +36,7 @@ llvm_llc_arm_STATIC_LIBRARIES := \
 
 llvm_llc_STATIC_LIBRARIES := \
   libLLVMAsmPrinter \
+  libLLVMIRReader \
   libLLVMAsmParser \
   libLLVMBitReader \
   libLLVMBitWriter \
diff --git a/tools/llvm-link/Android.mk b/tools/llvm-link/Android.mk
index 4398246..db8f2af 100644
--- a/tools/llvm-link/Android.mk
+++ b/tools/llvm-link/Android.mk
@@ -5,6 +5,7 @@ llvm_link_SRC_FILES := \
 
 llvm_link_STATIC_LIBRARIES := \
   libLLVMLinker \
+  libLLVMIRReader \
   libLLVMBitReader \
   libLLVMBitWriter \
   libLLVMAsmParser \
diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index e15f37b..e476cd7 100644
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -12,6 +12,7 @@ tablegen_SRC_FILES := \
   CodeGenRegisters.cpp \
   CodeGenSchedule.cpp \
   CodeGenTarget.cpp \
+  CTagsEmitter.cpp \
   DAGISelEmitter.cpp \
   DAGISelMatcherEmitter.cpp \
   DAGISelMatcherGen.cpp \