diff options
author | James Molloy <james.molloy@arm.com> | 2015-09-21 16:34:58 +0000 |
---|---|---|
committer | James Molloy <james.molloy@arm.com> | 2015-09-21 16:34:58 +0000 |
commit | 93bd4e99792aeab5de550e4e07b2a97eb5e08cf2 (patch) | |
tree | 3fb60af061a52fa4f1ed269309a52b7f6200747f /clang/lib/Basic | |
parent | 85441dd7244939be233724a49d00a83b54ae7c2e (diff) | |
download | bcm5719-llvm-93bd4e99792aeab5de550e4e07b2a97eb5e08cf2.tar.gz bcm5719-llvm-93bd4e99792aeab5de550e4e07b2a97eb5e08cf2.zip |
Revert "[ARM] Handle +t2dsp feature as an ArchExtKind in ARMTargetParser.def"
This was committed without the code review (http://reviews.llvm.org/D12938) being approved.
This reverts commit r248154.
llvm-svn: 248173
Diffstat (limited to 'clang/lib/Basic')
-rw-r--r-- | clang/lib/Basic/Targets.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 148d07e5c3b..2269c83d496 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -4121,7 +4121,6 @@ class ARMTargetInfo : public TargetInfo { unsigned CRC : 1; unsigned Crypto : 1; - unsigned T2DSP : 1; unsigned Unaligned : 1; enum { @@ -4473,7 +4472,6 @@ public: FPU = 0; CRC = 0; Crypto = 0; - T2DSP = 0; Unaligned = 1; SoftFloat = SoftFloatABI = false; HWDiv = 0; @@ -4509,8 +4507,6 @@ public: CRC = 1; } else if (Feature == "+crypto") { Crypto = 1; - } else if (Feature == "+t2dsp") { - T2DSP = 1; } else if (Feature == "+fp-only-sp") { HW_FP_remove |= HW_FP_DP | HW_FP_HP; } else if (Feature == "+strict-align") { @@ -4747,7 +4743,11 @@ public: // ACLE 6.4.7 DSP instructions bool hasDSP = false; - if (T2DSP) { + bool is5EOrAbove = (ArchVersion >= 6 || + (ArchVersion == 5 && CPUAttr.count('E'))); + // FIXME: We are not getting all 32-bit ARM architectures + bool is32Bit = (!isThumb() || supportsThumb2()); + if (is5EOrAbove && is32Bit && (CPUProfile != "M" || CPUAttr == "7EM")) { Builder.defineMacro("__ARM_FEATURE_DSP", "1"); hasDSP = true; } |