From 3aef70314b053a1df4f85ca4a6f3890d06ebbdd6 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Tue, 8 Jan 2013 23:43:13 -0800
Subject: Update LLVM for merge to r171905.

Android.mk
lib/Analysis/Android.mk
lib/CodeGen/Android.mk
lib/CodeGen/MachineScheduler.cpp - specify std::pop_heap()
lib/IR/Android.mk - new from lib/VMCore
lib/MC/Android.mk
lib/MC/MCAssembler.cpp - put back pointer param (from reference).
lib/Support/DeltaAlgorithm.cpp - iterator -> const_iterator !
lib/TableGen/Android.mk
lib/Target/ARM/ARMJITInfo.cpp - Removed unused legacy JIT changes
lib/Target/ARM/Android.mk
lib/Target/ARM/AsmParser/Android.mk
lib/Target/ARM/Disassembler/Android.mk
lib/Target/ARM/MCTargetDesc/Android.mk
lib/Target/Android.mk
lib/Target/Mips/Android.mk
lib/Target/Mips/Disassembler/Android.mk
lib/Target/Mips/MCTargetDesc/Android.mk
lib/Target/X86/Android.mk
lib/Target/X86/AsmParser/Android.mk
lib/Target/X86/Disassembler/Android.mk
lib/Transforms/IPO/Android.mk
lib/Transforms/Instrumentation/Android.mk
lib/Transforms/Scalar/Android.mk
lib/Transforms/Utils/Android.mk
lib/Transforms/Vectorize/Android.mk
lib/VMCore/Android.mk - moved to lib/IR
llvm-gen-intrinsics.mk - new Intrinsics.td location
utils/TableGen/Android.mk

Change-Id: Ifebdb1716c372fd917a844c44be9d10df66434b0
---
 lib/Target/ARM/Android.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/Target/ARM/Android.mk')

diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index bf58f11..6a25ae1 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -12,7 +12,6 @@ arm_codegen_TBLGEN_TABLES := \
   ARMGenFastISel.inc \
   ARMGenCallingConv.inc \
   ARMGenSubtargetInfo.inc \
-  ARMGenEDInfo.inc \
   ARMGenDisassemblerTables.inc
 
 arm_codegen_SRC_FILES := \
@@ -22,7 +21,6 @@ arm_codegen_SRC_FILES := \
   ARMCodeEmitter.cpp \
   ARMConstantIslandPass.cpp \
   ARMConstantPoolValue.cpp \
-  ARMELFWriterInfo.cpp \
   ARMExpandPseudoInsts.cpp \
   ARMFastISel.cpp \
   ARMFrameLowering.cpp \
@@ -39,6 +37,7 @@ arm_codegen_SRC_FILES := \
   ARMSubtarget.cpp \
   ARMTargetMachine.cpp \
   ARMTargetObjectFile.cpp \
+  ARMTargetTransformInfo.cpp \
   InstPrinter/ARMInstPrinter.cpp \
   MLxExpansionPass.cpp \
   Thumb1FrameLowering.cpp \
-- 
cgit v1.1