1 files changed, 4 insertions, 9 deletions
diff --git a/lib/Target/ARM/ARMTargetAsmInfo.cpp b/lib/Target/ARM/ARMTargetAsmInfo.cpp
index 10b570cd82..dfbe4c277a 100644
--- a/lib/Target/ARM/ARMTargetAsmInfo.cpp
+++ b/lib/Target/ARM/ARMTargetAsmInfo.cpp
@@ -17,6 +17,7 @@
 #include <cctype>
 using namespace llvm;
 
+
 const char *const llvm::arm_asm_table[] = {
                                       "{r0}", "r0",
                                       "{r1}", "r1",
@@ -42,15 +43,6 @@ const char *const llvm::arm_asm_table[] = {
                                       "{cc}", "cc",
                                       0,0};
 
-// Instantiate 'common' cases.
-TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
-TEMPLATE_INSTANTIATION(
-unsigned ARMTargetAsmInfo<TargetAsmInfo>::getInlineAsmLength(const char*) const);
-TEMPLATE_INSTANTIATION(
-  unsigned ARMTargetAsmInfo<TargetAsmInfo>::countArguments(const char*) const);
-TEMPLATE_INSTANTIATION(
-  unsigned ARMTargetAsmInfo<TargetAsmInfo>::countString(const char*) const);
-
 ARMDarwinTargetAsmInfo::ARMDarwinTargetAsmInfo(const ARMTargetMachine &TM):
   ARMTargetAsmInfo<DarwinTargetAsmInfo>(TM) {
   Subtarget = &DTM->getSubtarget<ARMSubtarget>();
@@ -288,3 +280,6 @@ unsigned ARMTargetAsmInfo<BaseTAI>::getInlineAsmLength(const char *s) const {
   free(s_copy);
   return Length;
 }
+
+// Instantiate default implementation.
+TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);