Merge up through LLVM r163557.
Updated Android.mk source files for Analysis, CodeGen, Target/Mips,
Transforms/Instrumentation, and Transforms/Utils.
Change-Id: I232a895e3ad9ec0c4a66f4308a11bb794b67940f
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 @@
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 @@
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
# =====================================================