1 files changed, 6 insertions, 2 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index ee4608badc0..890dfc3490a 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -136,13 +136,17 @@ ASTContext::getCanonicalTemplateTemplateParmDecl(
 }
 
 CXXABI *ASTContext::createCXXABI(const TargetInfo &T) {
-  if (!LangOpts.CPlusPlus) return NULL;
+  if (!LangOpts.CPlusPlus) return 0;
+
   switch (T.getCXXABI()) {
-  default:
+  case CXXABI_ARM:
+    return CreateARMCXXABI(*this);
+  case CXXABI_Itanium:
     return CreateItaniumCXXABI(*this);
   case CXXABI_Microsoft:
     return CreateMicrosoftCXXABI(*this);
   }
+  return 0;
 }
 
 ASTContext::ASTContext(const LangOptions& LOpts, SourceManager &SM,