Implement review feedback. Make thumb2 'normal' subtarget feature

llvm-svn: 72698

1 files changed, 6 insertions, 9 deletions

diff --git a/llvm/lib/Target/ARM/ARMSubtarget.cpp b/llvm/lib/Target/ARM/ARMSubtarget.cpp
index 96daca8067d..ef78cd52d85 100644
--- a/llvm/lib/Target/ARM/ARMSubtarget.cpp
+++ b/llvm/lib/Target/ARM/ARMSubtarget.cpp
@@ -20,7 +20,8 @@ ARMSubtarget::ARMSubtarget(const Module &M, const std::string &FS,
                            bool isThumb)
   : ARMArchVersion(V4T)
   , ARMFPUType(None)
-  , ThumbMode((isThumb ? Thumb1 : ThumbNone))
+  , IsThumb(isThumb)
+  , ThumbMode(Thumb1)
   , UseThumbBacktraces(false)
   , IsR9Reserved(false)
   , stackAlignment(4)
@@ -41,22 +42,18 @@ ARMSubtarget::ARMSubtarget(const Module &M, const std::string &FS,
   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;