11 files changed, 17 insertions, 8 deletions
diff --git a/README.android b/README.android
index 4fe6f85..f12faa7 100644
--- a/README.android
+++ b/README.android
@@ -21,8 +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
+* For Key Lime Pie: Synced to upstream r183849
 
+* Recent downstreaming on 2013/6/13: Synced to r183849 (Contact srhines for merge questions.)
 * 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.)
diff --git a/include/llvm/Config/llvm-platform-config.h b/include/llvm/Config/llvm-platform-config.h
index fb1b08f..9d47ffd 100644
--- a/include/llvm/Config/llvm-platform-config.h
+++ b/include/llvm/Config/llvm-platform-config.h
@@ -15,7 +15,7 @@
 #define LLVM_NATIVE_ARCH X86
 
 /* Host triple LLVM will be executed on */
-#define LLVM_HOSTTRIPLE "i686-unknown-linux-gnu"
+#define LLVM_HOST_TRIPLE "i686-unknown-linux-gnu"
 
 /* LLVM name for the native AsmParser init function, if available */
 #define LLVM_NATIVE_ASMPARSER LLVMInitializeX86AsmParser
@@ -42,7 +42,7 @@
 #define LLVM_NATIVE_ARCH ARM
 
 /* Host triple LLVM will be executed on */
-#define LLVM_HOSTTRIPLE "arm-unknown-linux-gnu"
+#define LLVM_HOST_TRIPLE "arm-unknown-linux-gnu"
 
 /* LLVM name for the native AsmParser init function, if available */
 #define LLVM_NATIVE_ASMPARSER LLVMInitializeARMAsmParser
@@ -69,7 +69,7 @@
 #define LLVM_NATIVE_ARCH Mips
 
 /* Host triple LLVM will be executed on */
-#define LLVM_HOSTTRIPLE "mipsel-unknown-linux-gnu"
+#define LLVM_HOST_TRIPLE "mipsel-unknown-linux-gnu"
 
 /* LLVM name for the native AsmParser init function, if available */
 #define LLVM_NATIVE_ASMPARSER LLVMInitializeMipsAsmParser
diff --git a/lib/ExecutionEngine/JIT/Android.mk b/lib/ExecutionEngine/JIT/Android.mk
index 02cef81..0466ba0 100644
--- a/lib/ExecutionEngine/JIT/Android.mk
+++ b/lib/ExecutionEngine/JIT/Android.mk
@@ -6,7 +6,6 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES :=	\
 	JIT.cpp	\
-	JITDwarfEmitter.cpp	\
 	JITEmitter.cpp	\
 	JITMemoryManager.cpp
 
diff --git a/lib/Linker/Android.mk b/lib/Linker/Android.mk
index 17d9a39..8c7a924 100644
--- a/lib/Linker/Android.mk
+++ b/lib/Linker/Android.mk
@@ -1,8 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 
 linker_SRC_FILES := \
-  LinkModules.cpp \
-  Linker.cpp
+  LinkModules.cpp
 
 # For the host
 # =====================================================
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index f322112..ce02c37 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -22,6 +22,8 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Transforms/Utils/Cloning.h"
+
+#include <ctype.h>
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
index a0b77ba..6c69ca2 100644
--- a/lib/MC/Android.mk
+++ b/lib/MC/Android.mk
@@ -18,6 +18,7 @@ mc_SRC_FILES := \
   MCELFObjectTargetWriter.cpp \
   MCELFStreamer.cpp \
   MCExpr.cpp \
+  MCExternalSymbolizer.cpp \
   MCInst.cpp \
   MCInstPrinter.cpp \
   MCInstrAnalysis.cpp \
@@ -29,6 +30,7 @@ mc_SRC_FILES := \
   MCObjectStreamer.cpp \
   MCObjectWriter.cpp \
   MCRegisterInfo.cpp \
+  MCRelocationInfo.cpp \
   MCSection.cpp \
   MCSectionCOFF.cpp	\
   MCSectionELF.cpp \
@@ -36,6 +38,7 @@ mc_SRC_FILES := \
   MCStreamer.cpp \
   MCSubtargetInfo.cpp \
   MCSymbol.cpp \
+  MCSymbolizer.cpp \
   MCValue.cpp \
   MCWin64EH.cpp \
   WinCOFFObjectWriter.cpp \
diff --git a/lib/Target/ARM/MCTargetDesc/Android.mk b/lib/Target/ARM/MCTargetDesc/Android.mk
index 111cc5e..af22753 100644
--- a/lib/Target/ARM/MCTargetDesc/Android.mk
+++ b/lib/Target/ARM/MCTargetDesc/Android.mk
@@ -15,6 +15,7 @@ arm_mc_desc_SRC_FILES := \
   ARMMCExpr.cpp \
   ARMMCTargetDesc.cpp \
   ARMMachObjectWriter.cpp \
+  ARMMachORelocationInfo.cpp \
   ARMUnwindOpAsm.cpp
 
 # For the host
diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index 65222d2..954b1d0 100644
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -13,6 +13,7 @@ mips_codegen_TBLGEN_TABLES := \
 
 mips_codegen_SRC_FILES := \
   Mips16FrameLowering.cpp \
+  Mips16HardFloat.cpp \
   Mips16ISelDAGToDAG.cpp \
   Mips16ISelLowering.cpp \
   Mips16InstrInfo.cpp \
@@ -31,6 +32,7 @@ mips_codegen_SRC_FILES := \
   MipsMachineFunction.cpp \
   MipsMCInstLower.cpp \
   MipsModuleISelDAGToDAG.cpp \
+  MipsOptimizeMathLibCalls.cpp \
   MipsOs16.cpp \
   MipsRegisterInfo.cpp \
   MipsSEFrameLowering.cpp \
diff --git a/lib/Target/Mips/MCTargetDesc/Android.mk b/lib/Target/Mips/MCTargetDesc/Android.mk
index 733acdb..fcf58c3 100644
--- a/lib/Target/Mips/MCTargetDesc/Android.mk
+++ b/lib/Target/Mips/MCTargetDesc/Android.mk
@@ -8,7 +8,6 @@ mips_mc_desc_TBLGEN_TABLES := \
 
 mips_mc_desc_SRC_FILES := \
   MipsAsmBackend.cpp \
-  MipsDirectObjLower.cpp \
   MipsELFObjectWriter.cpp \
   MipsELFStreamer.cpp \
   MipsMCAsmInfo.cpp \
diff --git a/lib/Target/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk
index 39478b3..31ba842 100644
--- a/lib/Target/X86/MCTargetDesc/Android.mk
+++ b/lib/Target/X86/MCTargetDesc/Android.mk
@@ -8,9 +8,11 @@ x86_mc_desc_TBLGEN_TABLES := \
 x86_mc_desc_SRC_FILES := \
   X86AsmBackend.cpp \
   X86ELFObjectWriter.cpp \
+  X86ELFRelocationInfo.cpp \
   X86MCTargetDesc.cpp \
   X86MCAsmInfo.cpp \
   X86MCCodeEmitter.cpp \
+  X86MachORelocationInfo.cpp \
   X86MachObjectWriter.cpp \
   X86WinCOFFObjectWriter.cpp
 
diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index ddaed0e..a61c1f3 100644
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -44,6 +44,7 @@ llvm_llc_STATIC_LIBRARIES := \
   libLLVMInstCombine \
   libLLVMInstrumentation \
   libLLVMCodeGen \
+  libLLVMObject \
   libLLVMipo \
   libLLVMipa \
   libLLVMLinker \