diff --git a/lib/Target/ARM/ARMTargetAsmInfo.h b/lib/Target/ARM/ARMTargetAsmInfo.h
index d3f2da0f4b0..8dbf544961e 100644
--- a/lib/Target/ARM/ARMTargetAsmInfo.h
+++ b/lib/Target/ARM/ARMTargetAsmInfo.h
@@ -46,8 +46,6 @@ namespace llvm {
     unsigned countString(const char *p) const;
   };
 
-  typedef ARMTargetAsmInfo<TargetAsmInfo> ARMGenericTargetAsmInfo;
-
   EXTERN_TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
 
   struct ARMDarwinTargetAsmInfo : public ARMTargetAsmInfo<DarwinTargetAsmInfo> {
diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp
index d71029475f2..9f70ab90059 100644
--- a/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/lib/Target/ARM/ARMTargetMachine.cpp
@@ -76,12 +76,11 @@ ThumbTargetMachine::ThumbTargetMachine(const Target &T, const Module &M,
 
 const TargetAsmInfo *ARMBaseTargetMachine::createTargetAsmInfo() const {
   switch (Subtarget.TargetType) {
-   case ARMSubtarget::isDarwin:
+  default: llvm_unreachable("Unknown ARM subtarget kind");
+  case ARMSubtarget::isDarwin:
     return new ARMDarwinTargetAsmInfo(*this);
-   case ARMSubtarget::isELF:
+  case ARMSubtarget::isELF:
     return new ARMELFTargetAsmInfo(*this);
-   default:
-    return new ARMGenericTargetAsmInfo(*this);
   }
 }