From 373aa5c665fe6df6b9c5586d397dc3617f25aab5 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Thu, 6 Feb 2014 23:41:26 -0800
Subject: 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
---
 lib/Target/ARM/ARM.td                   | 6 ++++++
 lib/Target/ARM/ARMSubtarget.cpp         | 1 +
 lib/Target/ARM/ARMSubtarget.h           | 3 +++
 lib/Target/Mips/Android.mk              | 1 -
 lib/Target/Mips/MCTargetDesc/Android.mk | 4 ++--
 5 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'lib/Target')

diff --git a/lib/Target/ARM/ARM.td b/lib/Target/ARM/ARM.td
index 36e5680..b73e981 100644
--- a/lib/Target/ARM/ARM.td
+++ b/lib/Target/ARM/ARM.td
@@ -227,6 +227,12 @@ def ProcR5      : SubtargetFeature<"r5", "ARMProcFamily", "CortexR5",
                                     FeatureAvoidPartialCPSR,
                                     FeatureT2XtPk]>;
 
+// RenderScript-specific support for 64-bit long types on all targets
+def FeatureLong64 : SubtargetFeature<"long64", "UseLong64",
+                                        "true",
+                                        "long type is forced to be 64-bit">;
+
+
 class ProcNoItin<string Name, list<SubtargetFeature> Features>
  : Processor<Name, NoItineraries, Features>;
 
diff --git a/lib/Target/ARM/ARMSubtarget.cpp b/lib/Target/ARM/ARMSubtarget.cpp
index 8351c63..2d749af 100644
--- a/lib/Target/ARM/ARMSubtarget.cpp
+++ b/lib/Target/ARM/ARMSubtarget.cpp
@@ -135,6 +135,7 @@ void ARMSubtarget::initializeEnvironment() {
   Thumb2DSP = false;
   UseNaClTrap = false;
   UnsafeFPMath = false;
+  UseLong64 = false;
 }
 
 void ARMSubtarget::resetSubtargetFeatures(const MachineFunction *MF) {
diff --git a/lib/Target/ARM/ARMSubtarget.h b/lib/Target/ARM/ARMSubtarget.h
index 5276901..567463c 100644
--- a/lib/Target/ARM/ARMSubtarget.h
+++ b/lib/Target/ARM/ARMSubtarget.h
@@ -191,6 +191,9 @@ protected:
   /// Target machine allowed unsafe FP math (such as use of NEON fp)
   bool UnsafeFPMath;
 
+  /// Force long to be a 64-bit type (RenderScript-specific)
+  bool UseLong64;
+
   /// stackAlignment - The minimum alignment known to hold of the stack frame on
   /// entry to the function and which must be maintained by every function.
   unsigned stackAlignment;
diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index 954b1d0..1af5985 100644
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -32,7 +32,6 @@ 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 fcf58c3..a2a7d63 100644
--- a/lib/Target/Mips/MCTargetDesc/Android.mk
+++ b/lib/Target/Mips/MCTargetDesc/Android.mk
@@ -9,11 +9,11 @@ mips_mc_desc_TBLGEN_TABLES := \
 mips_mc_desc_SRC_FILES := \
   MipsAsmBackend.cpp \
   MipsELFObjectWriter.cpp \
-  MipsELFStreamer.cpp \
   MipsMCAsmInfo.cpp \
   MipsMCCodeEmitter.cpp \
   MipsMCTargetDesc.cpp \
-  MipsReginfo.cpp
+  MipsReginfo.cpp \
+  MipsTargetStreamer.cpp
 
 # For the host
 # =====================================================
-- 
cgit v1.1