diff --git a/lib/Target/ARM/ARMTargetAsmInfo.cpp b/lib/Target/ARM/ARMTargetAsmInfo.cpp
index dfb78e8db9a..4524041fa45 100644
--- a/lib/Target/ARM/ARMTargetAsmInfo.cpp
+++ b/lib/Target/ARM/ARMTargetAsmInfo.cpp
@@ -13,6 +13,8 @@
 
 #include "ARMTargetAsmInfo.h"
 #include "ARMTargetMachine.h"
+#include <cstring>
+#include <cctype>
 using namespace llvm;
 
 ARMTargetAsmInfo::ARMTargetAsmInfo(const ARMTargetMachine &TM) {
@@ -80,4 +82,5 @@ ARMTargetAsmInfo::ARMTargetAsmInfo(const ARMTargetMachine &TM) {
   InlineAsmStart = "@ InlineAsm Start";
   InlineAsmEnd = "@ InlineAsm End";
   LCOMMDirective = "\t.lcomm\t";
+  isThumb = Subtarget->isThumb();
 }
diff --git a/lib/Target/ARM/ARMTargetAsmInfo.h b/lib/Target/ARM/ARMTargetAsmInfo.h
index 4edb1d2e431..3fb9bb00661 100644
--- a/lib/Target/ARM/ARMTargetAsmInfo.h
+++ b/lib/Target/ARM/ARMTargetAsmInfo.h
@@ -23,6 +23,8 @@ namespace llvm {
 
   struct ARMTargetAsmInfo : public TargetAsmInfo {
     ARMTargetAsmInfo(const ARMTargetMachine &TM);
+
+    bool isThumb;
   };