Apply changes to migrate to LLVM-160668-20120724.

- Update Android.mk for removed files and new files.

- llvm-ld has been removed in upstream, so we remove it as well.

Change-Id: I613ada916156a43993d4bba9cae6dcb6bf40ed2f

13 files changed, 31 insertions, 55 deletions

diff --git a/Android.mk b/Android.mk
index b5925b7..2aa4b2e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -65,7 +65,6 @@ subdirs += \
 #subdirs += tools/llc
 subdirs += tools/llvm-as
 subdirs += tools/llvm-dis
-subdirs += tools/llvm-ld
 subdirs += tools/llvm-link
 #subdirs += tools/opt
 
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index aa90805..19c58f3 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -14,9 +14,7 @@ analysis_SRC_FILES := \
   CaptureTracking.cpp \
   CodeMetrics.cpp \
   ConstantFolding.cpp \
-  DIBuilder.cpp \
   DbgInfoPrinter.cpp \
-  DebugInfo.cpp \
   DomPrinter.cpp \
   DominanceFrontier.cpp \
   IVUsers.cpp \
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index 5378e2e..bc60e2b 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -13,6 +13,7 @@ codegen_SRC_FILES := \
   DFAPacketizer.cpp \
   DeadMachineInstructionElim.cpp \
   DwarfEHPrepare.cpp \
+  EarlyIfConversion.cpp \
   EdgeBundles.cpp \
   ExecutionDepsFix.cpp \
   ExpandISelPseudos.cpp \
@@ -24,7 +25,6 @@ codegen_SRC_FILES := \
   InlineSpiller.cpp \
   InterferenceCache.cpp \
   IntrinsicLowering.cpp \
-  LLVMTargetMachine.cpp \
   LatencyPriorityQueue.cpp \
   LexicalScopes.cpp \
   LiveDebugVariables.cpp \
@@ -33,8 +33,10 @@ codegen_SRC_FILES := \
   LiveIntervalUnion.cpp \
   LiveRangeCalc.cpp \
   LiveRangeEdit.cpp \
+  LiveRegMatrix.cpp \
   LiveStackAnalysis.cpp \
   LiveVariables.cpp \
+  LLVMTargetMachine.cpp \
   LocalStackSlotAllocation.cpp \
   MachineBasicBlock.cpp \
   MachineBlockFrequencyInfo.cpp \
@@ -77,8 +79,8 @@ codegen_SRC_FILES := \
   RegAllocPBQP.cpp \
   RegisterClassInfo.cpp \
   RegisterCoalescer.cpp \
+  RegisterPressure.cpp \
   RegisterScavenging.cpp \
-  RenderMachineFunction.cpp \
   ScheduleDAG.cpp \
   ScheduleDAGInstrs.cpp \
   ScheduleDAGPrinter.cpp \
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index b7fc663..b48b5af 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -16,8 +16,8 @@
 #if !defined(ANDROID_TARGET_BUILD) || defined(ANDROID_ENGINEERING_BUILD)
 #   include "DwarfDebug.h"
 #   include "DwarfException.h"
-#   include "llvm/DebugInfo.h"
 #endif // !ANDROID_TARGET_BUILD || ANDROID_ENGINEERING_BUILD
+#include "llvm/DebugInfo.h"
 #include "llvm/Module.h"
 #include "llvm/CodeGen/GCMetadataPrinter.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
diff --git a/lib/TableGen/Android.mk b/lib/TableGen/Android.mk
index 4ef0dc0..0e79db5 100644
--- a/lib/TableGen/Android.mk
+++ b/lib/TableGen/Android.mk
@@ -4,6 +4,7 @@ libtablegen_SRC_FILES := \
   Error.cpp \
   Main.cpp \
   Record.cpp \
+  StringMatcher.cpp \
   TableGenAction.cpp \
   TableGenBackend.cpp \
   TGLexer.cpp \
diff --git a/lib/Target/ARM/ARMCodeEmitter.cpp b/lib/Target/ARM/ARMCodeEmitter.cpp
index b8627a2..af260a5 100644
--- a/lib/Target/ARM/ARMCodeEmitter.cpp
+++ b/lib/Target/ARM/ARMCodeEmitter.cpp
@@ -682,11 +682,6 @@ void ARMCodeEmitter::emitConstantToMemory(unsigned CPI, const Constant *C) {
       emitConstantToMemory(CPI, CA->getOperand(i));
     break;
   }
-  case Value::ConstantVectorVal:{
-    //FIXME:emit vector
-    const ConstantVector *CV = static_cast<const ConstantVector*>(C);
-    break;
-  }
   }
 
   return;
diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index 34cea3b..6bf146a 100644
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -15,13 +15,12 @@ mips_codegen_SRC_FILES := \
   MipsAsmPrinter.cpp \
   MipsCodeEmitter.cpp \
   MipsDelaySlotFiller.cpp \
-  MipsEmitGPRestore.cpp \
-  MipsExpandPseudo.cpp \
-  MipsJITInfo.cpp \
+  MipsFrameLowering.cpp \
   MipsInstrInfo.cpp \
   MipsISelDAGToDAG.cpp \
   MipsISelLowering.cpp \
-  MipsFrameLowering.cpp \
+  MipsJITInfo.cpp \
+  MipsLongBranch.cpp \
   MipsMachineFunction.cpp \
   MipsMCInstLower.cpp \
   MipsRegisterInfo.cpp \
diff --git a/lib/Target/Mips/InstPrinter/Android.mk b/lib/Target/Mips/InstPrinter/Android.mk
index 6e9a537..fc256cd 100644
--- a/lib/Target/Mips/InstPrinter/Android.mk
+++ b/lib/Target/Mips/InstPrinter/Android.mk
@@ -1,7 +1,10 @@
 LOCAL_PATH := $(call my-dir)
 
 mips_asm_printer_TBLGEN_TABLES := \
-  MipsGenAsmWriter.inc
+  MipsGenAsmWriter.inc \
+  MipsGenRegisterInfo.inc \
+  MipsGenSubtargetInfo.inc \
+  MipsGenInstrInfo.inc
 
 mips_asm_printer_SRC_FILES := \
   MipsInstPrinter.cpp
diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index c4df8ac..cc7a9da 100644
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 
 instrumentation_SRC_FILES := \
   AddressSanitizer.cpp \
+  BoundsChecking.cpp \
   EdgeProfiling.cpp \
   FunctionBlackList.cpp \
   GCOVProfiling.cpp \
diff --git a/lib/VMCore/Android.mk b/lib/VMCore/Android.mk
index c8b82c9..9906b49 100644
--- a/lib/VMCore/Android.mk
+++ b/lib/VMCore/Android.mk
@@ -8,7 +8,9 @@ vmcore_SRC_FILES := \
   ConstantFold.cpp \
   Constants.cpp \
   Core.cpp \
+  DebugInfo.cpp \
   DebugLoc.cpp \
+  DIBuilder.cpp \
   Dominators.cpp \
   Function.cpp \
   GVMaterializer.cpp \
diff --git a/llvm-tblgen-rules.mk b/llvm-tblgen-rules.mk
index b91fde9..3478317 100644
--- a/llvm-tblgen-rules.mk
+++ b/llvm-tblgen-rules.mk
@@ -59,6 +59,20 @@ $(intermediates)/%GenSubtargetInfo.inc: $(tblgen_source_dir)/../%.td $(TBLGEN)
 	$(call transform-td-to-out,subtarget)
 endif
 
+ifeq ($(tblgen_source_dir),$(LLVM_ROOT_PATH)/lib/Target/Mips/MCTargetDesc)
+$(intermediates)/%GenRegisterInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/%GenRegisterInfo.inc: $(tblgen_source_dir)/../%.td $(TBLGEN)
+	$(call transform-td-to-out, register-info)
+
+$(intermediates)/%GenInstrInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/%GenInstrInfo.inc: $(tblgen_source_dir)/../%.td $(TBLGEN)
+	$(call transform-td-to-out,instr-info)
+
+$(intermediates)/%GenSubtargetInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/%GenSubtargetInfo.inc: $(tblgen_source_dir)/../%.td $(TBLGEN)
+	$(call transform-td-to-out,subtarget)
+endif
+
 
 ifneq ($(filter %GenRegisterInfo.inc,$(tblgen_gen_tables)),)
 $(intermediates)/%GenRegisterInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
diff --git a/tools/llvm-ld/Android.mk b/tools/llvm-ld/Android.mk
deleted file mode 100644
index bbdb7a7..0000000
--- a/tools/llvm-ld/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-llvm_ld_SRC_FILES := \
-  Optimize.cpp  \
-  llvm-ld.cpp
-
-llvm_ld_STATIC_LIBRARIES := \
-  libLLVMBitWriter \
-  libLLVMLinker \
-  libLLVMBitReader \
-  libLLVMArchive \
-  libLLVMipo \
-  libLLVMScalarOpts \
-  libLLVMInstCombine \
-  libLLVMTransformUtils \
-  libLLVMVectorize \
-  libLLVMipa \
-  libLLVMAnalysis \
-  libLLVMTarget \
-  libLLVMCore \
-  libLLVMSupport
-
-#===---------------------------------------------------------------===
-# llvm-ld command line tool (host)
-#===---------------------------------------------------------------===
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := llvm-ld
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_SRC_FILES := $(llvm_ld_SRC_FILES)
-LOCAL_STATIC_LIBRARIES := $(llvm_ld_STATIC_LIBRARIES)
-LOCAL_LDLIBS += -lpthread -lm -ldl
-
-include $(LLVM_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
-include $(BUILD_HOST_EXECUTABLE)
diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index aa26ef6..92a2ce03e 100644
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -9,6 +9,7 @@ tablegen_SRC_FILES := \
   CodeGenDAGPatterns.cpp \
   CodeGenInstruction.cpp \
   CodeGenRegisters.cpp \
+  CodeGenSchedule.cpp \
   CodeGenTarget.cpp \
   DAGISelEmitter.cpp \
   DAGISelMatcherEmitter.cpp \
@@ -25,7 +26,6 @@ tablegen_SRC_FILES := \
   PseudoLoweringEmitter.cpp \
   RegisterInfoEmitter.cpp \
   SetTheory.cpp \
-  StringMatcher.cpp \
   SubtargetEmitter.cpp \
   TGValueTypes.cpp \
   TableGen.cpp \