diff options
author | Stephen Hines <srhines@google.com> | 2014-02-06 23:41:26 -0800 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2014-02-13 13:31:07 -0800 |
commit | 373aa5c665fe6df6b9c5586d397dc3617f25aab5 (patch) | |
tree | 44dcdf3911fadedb91a9077131708f4aa6e8245f /lib/Target | |
parent | ce9904c6ea8fd669978a8eefb854b330eb9828ff (diff) | |
download | llvm-373aa5c665fe6df6b9c5586d397dc3617f25aab5.tar.gz |
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
Diffstat (limited to 'lib/Target')
-rw-r--r-- | lib/Target/ARM/ARM.td | 6 | ||||
-rw-r--r-- | lib/Target/ARM/ARMSubtarget.cpp | 1 | ||||
-rw-r--r-- | lib/Target/ARM/ARMSubtarget.h | 3 | ||||
-rw-r--r-- | lib/Target/Mips/Android.mk | 1 | ||||
-rw-r--r-- | lib/Target/Mips/MCTargetDesc/Android.mk | 4 |
5 files changed, 12 insertions, 3 deletions
diff --git a/lib/Target/ARM/ARM.td b/lib/Target/ARM/ARM.td index 36e5680ca4e0..b73e98170900 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 8351c6326122..2d749af9dafe 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 5276901bbb92..567463cff4a2 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 954b1d02acf4..1af5985a9c8f 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 fcf58c36c728..a2a7d63856cd 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 # ===================================================== |