From d62cdbe700ab288e9ad447824066edb7d17167d9 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Wed, 22 Aug 2012 17:56:25 -0700
Subject: Add new files for Mips + fixups for merge to upstream r162314.

Change-Id: Ib545c0c991575c14b0b74e3b8fd4cc8c789b25d0
---
 README.android                       | 3 ++-
 lib/CodeGen/Android.mk               | 1 +
 lib/MC/Android.mk                    | 1 +
 lib/Target/ARM/ARMJITInfo.cpp        | 6 +++---
 lib/Target/Mips/Android.mk           | 9 ++++++++-
 lib/Target/Mips/AsmParser/Android.mk | 1 +
 lib/VMCore/Android.mk                | 1 +
 7 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/README.android b/README.android
index 506df78..fc1ccbb 100644
--- a/README.android
+++ b/README.android
@@ -19,8 +19,9 @@
 * For Ice Cream Sandwich MR1: Synced to upstream r142530
 * For Ice Cream Sandwich MR2: Synced to upstream r146714
 * For Jellybean: Synced to upstream r155090
-* For Jellybean MR1: Synced to upstream r160668
+* For Jellybean MR1: Synced to upstream r162314
 
+* Recent downstreaming on 2012/8/23: Synced to r162314 (Contact srhines for merge questions.)
 * Recent downstreaming on 2012/8/3: Synced to r160668 (Contact sliao for merge questions.)
 * Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/llvm/trunk@157317 (Contact srhines for merge questions.)
 * Recent downstreaming on 2012/4/24: Synced to r155090 (Contact sliao for merge questions.)
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index bc60e2b..03cf03b 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -61,6 +61,7 @@ codegen_SRC_FILES := \
   MachineSSAUpdater.cpp \
   MachineScheduler.cpp \
   MachineSink.cpp \
+  MachineTraceMetrics.cpp \
   MachineVerifier.cpp \
   OcamlGC.cpp \
   OptimizePHIs.cpp \
diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
index 71e331a..e2a22ad 100644
--- a/lib/MC/Android.mk
+++ b/lib/MC/Android.mk
@@ -28,6 +28,7 @@ mc_SRC_FILES := \
   MCObjectFileInfo.cpp \
   MCObjectStreamer.cpp \
   MCObjectWriter.cpp \
+  MCRegisterInfo.cpp \
   MCSection.cpp \
   MCSectionCOFF.cpp	\
   MCSectionELF.cpp \
diff --git a/lib/Target/ARM/ARMJITInfo.cpp b/lib/Target/ARM/ARMJITInfo.cpp
index 357fc3f..a812e21 100644
--- a/lib/Target/ARM/ARMJITInfo.cpp
+++ b/lib/Target/ARM/ARMJITInfo.cpp
@@ -314,9 +314,9 @@ void ARMJITInfo::relocate(void *Function, MachineRelocation *MR,
       *((intptr_t*)RelocPos) |= (ARM_AM::getSOImmValRot((unsigned)SoImmVal) >> 1)
             << ARMII::SoRotImmShift;
       *((intptr_t*)RelocPos) |= ARM_AM::getSOImmValImm((unsigned)SoImmVal);
-      // Set register Rn to PC.
-      *((intptr_t*)RelocPos) |=
-        getARMRegisterNumbering(ARM::PC) << ARMII::RegRnShift;
+       // Set register Rn to PC (which is register 15 on all architectures).
+       // FIXME: This avoids the need for register info in the JIT class.
+       *((intptr_t*)RelocPos) |= 15 << ARMII::RegRnShift;
       break;
     }
     case ARM::reloc_arm_pic_jt:
diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index 6bf146a..11e8997 100644
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -15,6 +15,7 @@ mips_codegen_SRC_FILES := \
   MipsAsmPrinter.cpp \
   MipsCodeEmitter.cpp \
   MipsDelaySlotFiller.cpp \
+  MipsELFWriterInfo.cpp \
   MipsFrameLowering.cpp \
   MipsInstrInfo.cpp \
   MipsISelDAGToDAG.cpp \
@@ -25,9 +26,15 @@ mips_codegen_SRC_FILES := \
   MipsMCInstLower.cpp \
   MipsRegisterInfo.cpp \
   MipsSubtarget.cpp \
+  MipsSEFrameLowering.cpp \
+  MipsSEInstrInfo.cpp \
+  MipsSERegisterInfo.cpp \
   MipsTargetMachine.cpp \
   MipsTargetObjectFile.cpp \
-  MipsSelectionDAGInfo.cpp
+  MipsSelectionDAGInfo.cpp \
+  Mips16FrameLowering.cpp \
+  Mips16InstrInfo.cpp \
+  Mips16RegisterInfo.cpp
 
 # For the host
 # =====================================================
diff --git a/lib/Target/Mips/AsmParser/Android.mk b/lib/Target/Mips/AsmParser/Android.mk
index e219f36..7d1817d 100644
--- a/lib/Target/Mips/AsmParser/Android.mk
+++ b/lib/Target/Mips/AsmParser/Android.mk
@@ -10,6 +10,7 @@ mips_asm_parser_SRC_FILES := \
 mips_asm_parser_C_INCLUDES := $(LOCAL_PATH)/..
 
 mips_asm_parser_TBLGEN_TABLES := \
+  MipsGenAsmMatcher.inc \
   MipsGenInstrInfo.inc \
   MipsGenRegisterInfo.inc \
   MipsGenSubtargetInfo.inc
diff --git a/lib/VMCore/Android.mk b/lib/VMCore/Android.mk
index 9906b49..cc18f48 100644
--- a/lib/VMCore/Android.mk
+++ b/lib/VMCore/Android.mk
@@ -30,6 +30,7 @@ vmcore_SRC_FILES := \
   PassRegistry.cpp \
   PrintModulePass.cpp \
   Type.cpp \
+  TypeFinder.cpp \
   Use.cpp \
   User.cpp \
   Value.cpp \
-- 
cgit v1.1