Implement review feedback. Make thumb2 'normal' subtarget feature
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@72698 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/ARM/ARMSubtarget.cpp b/lib/Target/ARM/ARMSubtarget.cpp
index 96daca8..ef78cd5 100644
--- a/lib/Target/ARM/ARMSubtarget.cpp
+++ b/lib/Target/ARM/ARMSubtarget.cpp
@@ -20,7 +20,8 @@
bool isThumb)
: ARMArchVersion(V4T)
, ARMFPUType(None)
- , ThumbMode((isThumb ? Thumb1 : ThumbNone))
+ , IsThumb(isThumb)
+ , ThumbMode(Thumb1)
, UseThumbBacktraces(false)
, IsR9Reserved(false)
, stackAlignment(4)
@@ -41,22 +42,18 @@
if (Len >= 5 && TT.substr(0, 4) == "armv")
Idx = 4;
else if (Len >= 6 && TT.substr(0, 6) == "thumb") {
- isThumb = true;
+ IsThumb = true;
if (Len >= 7 && TT[5] == 'v')
Idx = 6;
}
if (Idx) {
unsigned SubVer = TT[Idx];
if (SubVer > '4' && SubVer <= '9') {
- if (SubVer >= '7') {
+ if (SubVer >= '7')
ARMArchVersion = V7A;
- if (isThumb)
- ThumbMode = Thumb2;
- } else if (SubVer == '6') {
+ else if (SubVer == '6')
ARMArchVersion = V6;
- if (isThumb && Len >= Idx+3 && TT[Idx+1] == 't' && TT[Idx+2] == '2')
- ThumbMode = Thumb2;
- } else if (SubVer == '5') {
+ else if (SubVer == '5') {
ARMArchVersion = V5T;
if (Len >= Idx+3 && TT[Idx+1] == 't' && TT[Idx+2] == 'e')
ARMArchVersion = V5TE;