diff --git a/lib/Target/ARM/ARMSubtarget.cpp b/lib/Target/ARM/ARMSubtarget.cpp
index 4aa249af830..e6110885741 100644
--- a/lib/Target/ARM/ARMSubtarget.cpp
+++ b/lib/Target/ARM/ARMSubtarget.cpp
@@ -51,7 +51,7 @@ 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") {
+  else if (Len >= 6 && TT.substr(0, 5) == "thumb") {
     IsThumb = true;
     if (Len >= 7 && TT[5] == 'v')
       Idx = 6;
@@ -59,15 +59,19 @@ ARMSubtarget::ARMSubtarget(const Module &M, const std::string &FS,
   if (Idx) {
     unsigned SubVer = TT[Idx];
     if (SubVer > '4' && SubVer <= '9') {
-      if (SubVer >= '7')
+      if (SubVer >= '7') {
         ARMArchVersion = V7A;
-      else if (SubVer == '6')
+      } else if (SubVer == '6') {
         ARMArchVersion = V6;
-      else if (SubVer == '5') {
+        if (Len >= Idx+3 && TT[Idx+1] == 't' && TT[Idx+2] == '2')
+          ARMArchVersion = V6T2;
+      } else if (SubVer == '5') {
         ARMArchVersion = V5T;
         if (Len >= Idx+3 && TT[Idx+1] == 't' && TT[Idx+2] == 'e')
           ARMArchVersion = V5TE;
       }
+      if (ARMArchVersion >= V6T2)
+        ThumbMode = Thumb2;
     }
   }