Update LLVM for merge to 3.4.

Update config.h files.

Add RS SubtargetFeature for +long64 on ARM devices.

Adjust Android.mk for added/removed files:

+  Delinearization.cpp
-  PathNumbering.cpp
-  PathProfileInfo.cpp
-  PathProfileVerifier.cpp
-  ProfileDataLoader.cpp
-  ProfileDataLoaderPass.cpp
-  ProfileEstimatorPass.cpp
-  ProfileInfo.cpp
-  ProfileInfoLoader.cpp
-  ProfileInfoLoaderPass.cpp
-  ProfileVerifierPass.cpp

+  LiveRegUnits.cpp
-  ShrinkWrapping.cpp
+  StackMaps.cpp
-  StrongPHIElimination.cpp

+  DIEHash.cpp

+  LegacyPassManager.cpp

+  ELF.cpp

+  Unicode.cpp

-  MipsOptimizeMathLibCalls.cpp

-  MipsELFStreamer.cpp
+  MipsTargetStreamer.cpp

-  EdgeProfiling.cpp
+  DataFlowSanitizer.cpp
+  DebugIR.cpp
-  OptimalEdgeProfiling.cpp
-  PathProfiling.cpp
-  ProfilingUtils.cpp

-  BasicBlockPlacement.cpp
+  LoopRerollPass.cpp
+  PartiallyInlineLibCalls.cpp
+  SampleProfile.cpp

+  GlobalStatus.cpp

Change-Id: I17dcf0bf53a1720acd8226ae3e30d84993562a91

3 files changed, 6 insertions, 5 deletions

diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index 7182e50..cd90933 100644
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -3,13 +3,11 @@ LOCAL_PATH:= $(call my-dir)
 instrumentation_SRC_FILES := \
   AddressSanitizer.cpp \
   BoundsChecking.cpp \
-  EdgeProfiling.cpp \
+  DataFlowSanitizer.cpp \
+  DebugIR.cpp \
   GCOVProfiling.cpp \
   Instrumentation.cpp \
   MemorySanitizer.cpp \
-  OptimalEdgeProfiling.cpp \
-  PathProfiling.cpp \
-  ProfilingUtils.cpp \
   ThreadSanitizer.cpp
 
 # For the host
diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index d2e1478..7deb605 100644
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -2,7 +2,6 @@ LOCAL_PATH:= $(call my-dir)
 
 transforms_scalar_SRC_FILES := \
   ADCE.cpp \
-  BasicBlockPlacement.cpp \
   CodeGenPrepare.cpp \
   ConstantProp.cpp \
   CorrelatedValuePropagation.cpp \
@@ -17,16 +16,19 @@ transforms_scalar_SRC_FILES := \
   LoopDeletion.cpp \
   LoopIdiomRecognize.cpp \
   LoopInstSimplify.cpp \
+  LoopRerollPass.cpp \
   LoopRotation.cpp \
   LoopStrengthReduce.cpp \
   LoopUnrollPass.cpp \
   LoopUnswitch.cpp \
   LowerAtomic.cpp \
   MemCpyOptimizer.cpp \
+  PartiallyInlineLibCalls.cpp \
   Reassociate.cpp \
   Reg2Mem.cpp \
   SCCP.cpp \
   SROA.cpp \
+  SampleProfile.cpp \
   Scalar.cpp \
   ScalarReplAggregates.cpp \
   SimplifyCFGPass.cpp \
diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index 9bf9ef3..73bb3bf 100644
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -10,6 +10,7 @@ transforms_utils_SRC_FILES := \
   CmpInstAnalysis.cpp \
   CodeExtractor.cpp \
   DemoteRegToStack.cpp \
+  GlobalStatus.cpp \
   InlineFunction.cpp \
   InstructionNamer.cpp \
   LCSSA.cpp \